diff --git a/facebook/README~ b/facebook/README~
deleted file mode 100755
index 650ae1e3..00000000
--- a/facebook/README~
+++ /dev/null
@@ -1,40 +0,0 @@
-Installing the Friendica/Facebook connector
-
-1. Visit https://developers.facebook.com/apps to register an app.
-    a) Click "Create a new app"
-    b) We'd be very happy if you include "Friendica" in the application name
-       to increase name recognition.  
-    c) Edit your app settings on the setup page.  The Friendica icons are present
-       in the images directory and may be uploaded as a Facebook app icon.  Use 
-       images/friendica-16.jpg for the Icon and images/Friendica-128.jpg for the logo.
-    d) In the App Display name enter the name of your app (this should default to the
-       name you chose in part a).
-    e) Enter YourDomain.com in the App Domain field and hit return.
-    f) In "Select how your app connects with Facebook select "Website" and enter the 
-       full URL to your Friendica install including HTTPS and a trailing slash.
-
-2.    Enable the Facebook plugin by clicking on the icon next to it's name on the plugin
-      page of your admin panel.
-   b) return to the Facebook plugin page in your admin panel, and fill in the App-ID
-      and Application Secret settings you got from Facebook.
-   c) Click save.
-   d) Finally, return to the Facebook settings page, and activate real-time updates.
-
-3.    To use the Facebook plugin, visit the "connector settings" area of your settings
-      page.  Click "Install Facebook Connector".  
-4.    This will ask you to login to Facebook and allow the plugin to do it's stuff.  
-      Allow it to do so.
-5.    You're done. To turn it off visit the Plugin Settings page again and
-      'Remove Facebook posting'.
-
-Vidoes and embeds will not be posted if there is no other content. Links 
-and images will be converted to a format suitable for the Facebook API and 
-long posts truncated - with a link to view the full post. 
-
-Facebook contacts will not be able to view private photos, as they are not able to
-authenticate to your site to establish identity. We will address this 
-in a future release.
-
-Info: please make sure that you understand all aspects due to Friendica's 
-default licence which is: MIT License (further info:
-https://github.com/friendica/friendica/blob/master/LICENSE)
diff --git a/impressum/README~ b/impressum/README~
deleted file mode 100755
index 457729dc..00000000
--- a/impressum/README~
+++ /dev/null
@@ -1,18 +0,0 @@
-Impressum Plugin for Friendica
-
-Author: Tobias Diekershoff
-        tobias.diekershoff@gmx.net
-
-License: 3-clause BSD license (same as Friendica)
-
-About
-  This plugin adds an Impressum block to the /friendica page with informations
-  about the page operator/owner and how to contact you in case of any questions.
-
-  In the notes and postal fields you can use HTML tags for formatting.
-
-Configuration:
-  Simply fill in the fields in the impressium settings page in the plugins area
-  of your admin panel.
- 
-
diff --git a/openstreetmap/README~ b/openstreetmap/README~
deleted file mode 100644
index 5c731fac..00000000
--- a/openstreetmap/README~
+++ /dev/null
@@ -1,27 +0,0 @@
- ____ OpenStreetMap Plugin ____
-by Mike Macgirvin
-   Klaus Weidenbach
-
-This addon allows you to use OpenStreetMap for displaying locations.
-
-___ Requirements ___
-
-To use this plugin you need a tile Server that provides the maps.
-OpenStreetMap data is free for everyone to use. Their tile servers are not.
-Please take a look at their "Tile Usage Policy":
-http://wiki.openstreetmap.org/wiki/Tile_usage_policy
-You can run your own tile server or choose one from their list of public
-tile servers: http://wiki.openstreetmap.org/wiki/TMS
-Support the OpenStreetMap community and share the load.
-
-___ Configuration ___
-
-Activate the plugin from your admin panel.  
-
-You can now add a Tile Server and default zoom level in the plugin settings
-page of your admin panel.
-
-The Time Server URL points to the tile server you want to use. Use the full URL,
-with protocol (http/s) and trailing slash. You can configure the default zoom
-level on the map in the Default Zoom box.  1 will show the whole world and 18 is the highest
-zoom level available.
diff --git a/smiley_pack/smiley_pack.php~ b/smiley_pack/smiley_pack.php~
deleted file mode 100644
index d85f9b5e..00000000
--- a/smiley_pack/smiley_pack.php~
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-/*
- * Name: Smiley Pack
- * Description: Pack of smileys that make master too AOLish.
- * Version: 1.0
- * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template) 
- * All smileys from sites offering them as Public Domain
- * 
- * 
- */
-
-function smiley_pack_install() {
-	register_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
-}
-
-function smiley_pack__uninstall() {
-	unregister_hook('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
-}
-
- 
-
-function smiley_pack_smilies(&$a,&$b) {
-
-#Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
-
-#Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
-#when all else fails.
-
-
-
-#Animal smileys.
-
-	$b['texts'][] = ':bunnyflowers';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />';
-
-	$b['texts'][] = ':chick';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick' . '" />';
-
-	$b['texts'][] = ':bumblebee';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bee' . '" />';	
-
-	$b['texts'][] = ':ladybird';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':ladybird' . '" />';	
-
-	$b['texts'][] = ':bigspider';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':bigspider' . '" />';	
-
-	$b['texts'][] = ':cat';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':cat' . '" />';	
-
-	$b['texts'][] = ':bunny';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':bunny' . '" />';	
-
-	$b['texts'][] = ':chick';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick' . '" />';	
-
-	$b['texts'][] = ':cow';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow' . '" />';	
-    
-	$b['texts'][] = ':crab';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab' . '" />';	
-
-	$b['texts'][] = ':dolphin';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dolphin' . '" />';	
-
-	$b['texts'][] = ':dragonfly';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':dragonfly' . '" />';	
-
-	$b['texts'][] = ':frog';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':frog' . '" />';	
-
-	$b['texts'][] = ':hamster';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';	
-
-	$b['texts'][] = ':monkey';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':monkey' . '" />';	
-
-	$b['texts'][] = ':horse';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse' . '" />';	
-  
-	$b['texts'][] = ':parrot';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot' . '" />';	
-
-	$b['texts'][] = ':tux';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';	
-
-	$b['texts'][] = ':snail';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':snail' . '" />';	
-
-	$b['texts'][] = ':sheep';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':sheep' . '" />';	
-
-	$b['texts'][] = ':dog';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog' . '" />';	
-
-	$b['texts'][] = ':elephant';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elephant' . '" />';	
-
-	$b['texts'][] = ':fish';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':fish' . '" />';	
-
-	$b['texts'][] = ':giraffe';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':giraffe' . '" />';	
-
-	$b['texts'][] = ':pig';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig' . '" />';	
-
-
-
-#Baby Smileys
-
-	$b['texts'][] = ':baby';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby' . '" />';	
-
-	$b['texts'][] = ':babycot';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot' . '" />';	
-	
-
-	$b['texts'][] = ':pregnant';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant' . '" />';	
-
-	$b['texts'][] = ':stork';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork' . '" />';	
-
-
-#Confused Smileys	
-	$b['texts'][] = ':confused';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused' . '" />';	
-    
-	$b['texts'][] = ':shrug';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug' . '" />';	
-
-	$b['texts'][] = ':stupid';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid' . '" />';	
-
-	$b['texts'][] = ':dazed';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed' . '" />';	
-
-
-#Cool Smileys
-
-	$b['texts'][] = ':affro';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro' . '" />';	
-
-	$b['texts'][] = ':cool';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';	
-
-#Devil/Angel Smileys
-
-	$b['texts'][] = ':angel';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel' . '" />';	
-
-	$b['texts'][] = ':cherub';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':cherub' . '" />';	
-
-	$b['texts'][] = ':devilangel';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':devilangel' . '" />';	
-
-	$b['texts'][] = ':catdevil';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':catdevil' . '" />';	
-
-	$b['texts'][] = ':devillish';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish' . '" />';	
-	
-	$b['texts'][] = ':daseesaw';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw' . '" />';	
-
-	$b['texts'][] = ':turnevil';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil' . '" />';	
-	
-	$b['texts'][] = ':saint';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint' . '" />';	
-
-	$b['texts'][] = ':graveside';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';	
-
-#Unpleasent smileys.
-
-	$b['texts'][] = ':toilet';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet' . '" />';	
-
-	$b['texts'][] = ':fartinbed';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':fartinbed' . '" />';
-
-	$b['texts'][] = ':vomit';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
-
-	$b['texts'][] = ':fartblush';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush' . '" />';
-
-#Drinks
-
-	$b['texts'][] = ':tea';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea' . '" />';
-
-	$b['texts'][] = ':drool';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool' . '" />';
-
-#Sad smileys
-
-	$b['texts'][] = ':crying';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying' . '" />';
-
-	$b['texts'][] = ':prisoner';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner' . '" />';
-
-#Smoking - only one smiley in here, maybe it needs moving elsewhere?
-
-	$b['texts'][] = ':smoking';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking' . '" />';
-
-#Sport smileys
-
-	$b['texts'][] = ':basketball';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball' . '" />';
-
-	$b['texts'][] = ':bowling';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bowling' . '" />';
-
-	$b['texts'][] = ':cycling';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':cycling' . '" />';
-
-	$b['texts'][] = ':darts';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':darts' . '" />';
-
-	$b['texts'][] = ':fencing';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':fencing' . '" />';
-
-	$b['texts'][] = ':golf';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
-
-	$b['texts'][] = ':juggling';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':juggling' . '" />';
-
-	$b['texts'][] = ':skipping';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping' . '" />';
-
-	$b['texts'][] = ':archery';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery' . '" />';
-
-	$b['texts'][] = ':football';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
-
-	$b['texts'][] = ':surfing';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing' . '" />';
-
-	$b['texts'][] = ':snooker';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker' . '" />';
-  
-	$b['texts'][] = ':tennis';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
-
-	$b['texts'][] = ':horseriding';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding' . '" />';
-
-#Love smileys
-
-	$b['texts'][] = ':iloveyou';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou' . '" />';
-
-	$b['texts'][] = ':inlove';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':inlove' . '" />';
-
-	$b['texts'][] = '~love';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':love' . '" />';
-
-	$b['texts'][] = ':lovebear';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':lovebear' . '" />';
-
-	$b['texts'][] = ':lovebed';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':lovebed' . '" />';
-
-	$b['texts'][] = ':loveheart';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart' . '" />';
-
-#Tired/Sleep smileys
-
-	$b['texts'][] = ':countsheep';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep' . '" />';
-
-	$b['texts'][] = ':hammock';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hammock' . '" />';
-
-	$b['texts'][] = ':pillow';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
-
-#Fight/Flame/Violent smileys
-
-	$b['texts'][] = ':2guns';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns' . '" />';
-
-	$b['texts'][] = ':alienfight';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
-
-	$b['texts'][] = ':army';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army' . '" />';
-
-	$b['texts'][] = ':arrowhead';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':arrowhead' . '" />';
-
-	$b['texts'][] = ':bfg';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
-
-	$b['texts'][] = ':bowman';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':bowman' . '" />';
-
-	$b['texts'][] = ':chainsaw';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':chainsaw' . '" />';
-
-	$b['texts'][] = ':crossbow';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':crossbow' . '" />';
-
-	$b['texts'][] = ':crusader';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':crusader' . '" />';
-
-	$b['texts'][] = ':dead';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':dead' . '" />';
-
-	$b['texts'][] = ':hammersplat';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':hammersplat' . '" />';
-
-	$b['texts'][] = ':lasergun';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':lasergun' . '" />';
-
-	$b['texts'][] = ':machinegun';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun' . '" />';
-
-	$b['texts'][] = ':marine';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
-
-	$b['texts'][] = ':sabre';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
-
-	$b['texts'][] = ':tank';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
-
-	$b['texts'][] = ':viking';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
-
-	$b['texts'][] = ':gangs';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
-
-	$b['texts'][] = ':acid';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid' . '" />';
-
-#Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
-
-	$b['texts'][] = ':alienmonster';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
-
-	$b['texts'][] = ':barbarian';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbarian' . '" />';
-
-	$b['texts'][] = ':dinosaur';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaur' . '" />';
-
-	$b['texts'][] = ':dragon';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon' . '" />';
-
-	$b['texts'][] = ':draco';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
-
-	$b['texts'][] = ':ghost';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost' . '" />';
-
-	$b['texts'][] = ':mummy';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
-
-#Food smileys
-
-	$b['texts'][] = ':apple';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple' . '" />';
-
-	$b['texts'][] = ':broccoli';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocolli' . '" />';
-
-	$b['texts'][] = ':cake';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':cake' . '" />';
-
-	$b['texts'][] = ':carrot';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carrot' . '" />';
-
-	$b['texts'][] = ':popcorn';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn' . '" />';
-
-	$b['texts'][] = ':tomato';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato' . '" />';
-
-	$b['texts'][] = ':banana';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banana' . '" />';
-
-	$b['texts'][] = ':cooking';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
-
-	$b['texts'][] = ':fryegg';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />';
-
-#Happy smileys
-
-	$b['texts'][] = ':cloud9';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
-
-	$b['texts'][] = ':tearsofjoy';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
-
-#Repsect smileys
-
-	$b['texts'][] = ':bow';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow' . '" />';
-
-	$b['texts'][] = ':bravo';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
-
-	$b['texts'][] = ':hailking';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':hailking' . '" />';
-
-	$b['texts'][] = ':number1';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1' . '" />';
-
-#Laugh smileys
-
-	$b['texts'][] = ':hahaha';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha' . '" />';
-
-	$b['texts'][] = ':loltv';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv' . '" />';
-
-	$b['texts'][] = ':rofl';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';
-
-#Music smileys
-
-	$b['texts'][] = ':dj';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
-
-	$b['texts'][] = ':drums';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums' . '" />';
-
-	$b['texts'][] = ':elvis';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
-
-	$b['texts'][] = ':guitar';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar' . '" />';
-
-	$b['texts'][] = ':trumpet';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet' . '" />';
-
-	$b['texts'][] = ':violin';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
-
-#Smileys that used to be in core
-
-	$b['texts'][] = ':headbang';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang' . '" />';
-
-		$b['texts'][] = ':beard';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard' . '" />';
-
-	$b['texts'][] = ':whitebeard';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard' . '" />';
-
-	$b['texts'][] = ':shaka';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka' . '" />';
-
-	$b['texts'][] = ':\\.../';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
-
-	$b['texts'][] = ':\\ooo/';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
-
-	$b['texts'][] = ':headdesk';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/headdesk.gif' . '" alt="' . ':headdesk' . '" />';
-
-#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
-
-	$b['texts'][] = ':-d';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
-
-	$b['texts'][] = ':-o';
-	$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
-
-
-
-
-}
diff --git a/twitter/README~ b/twitter/README~
deleted file mode 100755
index 3b8f0e85..00000000
--- a/twitter/README~
+++ /dev/null
@@ -1,91 +0,0 @@
-____ Twitter Plugin ____
-By Tobias Diekershoff
-   tobias.diekershoff(at)gmx.net
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!   This addon is currently under development. If you have any problem     !!
-!!   with it, please contact the Author.                                    !!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-With this addon to Friendica you can give your user the possibility to post
-their *public* messages to Twitter. The messages will be strapped their rich
-context and shortened to 140 characters length if necessary. If shortening of
-the message was performed a link will be added to the Tweet pointing to the
-original message on your server.
-
-There is a similar addon for forwarding public messages to
-"StatusNet":http://status.net [[StatusNet Plugin]].
-
-Online version of this document: http://ur1.ca/35mml
-
-___ Requirements ___
-
-To use this plugin you have to register your Friendica instance as an
-_client application_ for Twitter with _read and write_ access, we do not intend
-to use Twitter for login. The registration can be done at twitter.com/apps
-and you need to have a Twitter account to do so.
-
-After you registered the application you get an OAuth consumer key / secret
-pair that identifies your app, you will need them for configuration.
-
-The inclusion of a shorturl for the original posting in cases when the
-message was longer than 140 characters requires it, that you have *PHP5+* and
-*curl* on your server.
-
-___ Where to find ___
-
-In the Friendica git repository /addon/twitter/, this directory contains
-all required PHP files (including the Twitter OAuth library [1] by Abraham
-Williams, MIT licensed and the Slinky library [2] by Beau Lebens, BSD license),
-a CSS file for styling of the user configuration and an image to _Sign in with
-Twitter_.
-
-[1] https://github.com/abraham/twitteroauth
-[2] http://dentedreality.com.au/projects/slinky/
-
-___ Configuration ___
-
-__ Global Configuration __
-
-If you enabled an administrator account, please use the admin panel to cofigure
-the Twitter relay.  If you for any reason prefer to use a configuration file instead 
-of the admin panels, please refer to the Alternative Configuration below. 
-
-Activate the plugin from the plugins section of your admin panel.  When you have
-done so, add your consumer key and consumer secret in the settings section of the 
-plugin page.
-
-When this is done your user can now configure their Twitter connection at
-"Settings -> Plugin Settings" and enable the forwarding of their *public*
-messages to Twitter.
-
-__ Alternative Configuration __
-
--To activate this addon add @twitter@ to the list of active addons in your
-.htconfig.php file 
-
-$a->config['system']['addon'] = "twitter, ..."
-
-Afterwards you need to add your OAuth consumer key / secret pair to it by
-adding the following two lines
-
-$a->config['twitter']['consumerkey'] = 'your consumer KEY here';
-$a->config['twitter']['consumersecret'] = 'your consumer SECRET here';
-
-
-__ User Configuration __
-
-When the OAuth consumer informations are correctly placed into the
-configuration file and a user visits the "Plugin Settings" page they can now
-connect to Twitter. To do so one has to follow the _Sign in with Twitter_
-button (the page will be opened in a new browser window/tab) and get a PIN from
-Twitter. This PIN has to be entered on the settings page. After submitting the
-PIN the plugin will get OAuth credentials identifying this user from the
-Friendica account.
-
-If this first step was successful the Twitter configuration will be changed
-on the "Plugin Settings" page displaying two check boxes. One to enable/disable
-the forwarding of *all public* postings to Twitter and one to clear the
-personal configuration from the Twitter credentials.
-
-