diff --git a/appnetpost/appnetpost.php b/appnetpost/appnetpost.php
index a5c5e8c5..dbe06a4e 100644
--- a/appnetpost/appnetpost.php
+++ b/appnetpost/appnetpost.php
@@ -53,11 +53,11 @@ function appnetpost_settings(&$a,&$s) {
 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
 	$s .= '<span id="settings_appnetpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
-	$s .= '<h3>' . t('App.net Post Settings') . '</h3>';
+	$s .= '<h3>' . t('App.net') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_appnetpost_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_appnetpost_expanded\'); openClose(\'settings_appnetpost_inflated\');">';
-	$s .= '<h3>' . t('App.net Post Settings') . '</h3>';
+	$s .= '<h3>' . t('App.net') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="appnetpost-enable-wrapper">';
diff --git a/blockem/blockem.php b/blockem/blockem.php
index d77ece71..223a1990 100755
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -50,11 +50,11 @@ function blockem_addon_settings(&$a,&$s) {
 		$words = '';
 
     $s .= '<span id="settings_blockem_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
-    $s .= '<h3>' . t('"Blockem" Settings') . '</h3>';
+    $s .= '<h3>' . t('"Blockem"') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_blockem_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
-    $s .= '<h3>' . t('"Blockem" Settings') . '</h3>';
+    $s .= '<h3>' . t('"Blockem"') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="blockem-wrapper">';
diff --git a/blogger/blogger.php b/blogger/blogger.php
index c75cebac..8d60472c 100755
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -71,11 +71,11 @@ function blogger_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
-    $s .= '<h3>' . t('Blogger Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Blogger') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_blogger_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
-    $s .= '<h3>' . t('Blogger Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Blogger') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="blogger-enable-wrapper">';
diff --git a/curweather/curweather.php b/curweather/curweather.php
index bd0d6c75..67d5939e 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -87,7 +87,7 @@ function curweather_plugin_settings(&$a,&$s) {
 	/* Add some HTML to the existing form */
 
 	$s .= '<div class="settings-block">';
-	$s .= '<h3>' . t('Current Weather Settings') . '</h3>';
+	$s .= '<h3>' . t('Current Weather') . '</h3>';
 	$s .= '<div id="curweather-settings-wrapper">';
 	$s .= '<p>Find the location code for the airport/weather station nearest you <a href="http://en.wikipedia.org/wiki/International_Air_Transport_Association_airport_code" target="_blank">here</a>.</p>';
 	$s .= '<label id="curweather-location-label" for="curweather_loc">' . t('Weather Location: ') . '</label>';
diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php
index 9f8108f1..db905a15 100644
--- a/fbpost/fbpost.php
+++ b/fbpost/fbpost.php
@@ -207,7 +207,7 @@ function fbpost_content(&$a) {
 	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'
 		. $a->get_baseurl() . '/addon/fbpost/fbpost.css' . '" media="all" />' . "\r\n";
 
-	$o .= '<h3>' . t('Facebook Post') . '</h3>';
+	$o .= '<h3>' . t('Facebook') . '</h3>';
 
 	if(! $fb_installed) {
 		$o .= '<div id="fbpost-enable-wrapper">';
@@ -293,8 +293,7 @@ function fbpost_content(&$a) {
 function fbpost_plugin_settings(&$a,&$b) {
 
 	$b .= '<div class="settings-block">';
-	//$b .= '<h3>' . t('Facebook Post Settings') . '</h3>';
-	$b .= '<a href="fbpost"><h3>' . t('Facebook Post Settings') . '</a></h3>';
+	$b .= '<a href="fbpost"><h3>' . t('Facebook') . '</a></h3>';
 	$b .= '</div>';
 
 }
diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php
index ee70481c..e69cd2c0 100644
--- a/fbsync/fbsync.php
+++ b/fbsync/fbsync.php
@@ -120,11 +120,11 @@ function fbsync_settings(&$a,&$s) {
 	/* Add some HTML to the existing form */
 
 	$s .= '<span id="settings_fbsync_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
-	$s .= '<h3>' . t('Facebook Import Settings') . '</h3>';
+	$s .= '<h3>' . t('Facebook Import') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_fbsync_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_fbsync_expanded\'); openClose(\'settings_fbsync_inflated\');">';
-	$s .= '<h3>' . t('Facebook Import Settings') . '</h3>';
+	$s .= '<h3>' . t('Facebook Import') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="fbsync-enable-wrapper">';
diff --git a/forumlist/forumlist.php b/forumlist/forumlist.php
index 50fc0a5c..61a20c71 100644
--- a/forumlist/forumlist.php
+++ b/forumlist/forumlist.php
@@ -158,11 +158,11 @@ function forumlist_plugin_settings(&$a,&$s) {
 
 	/* Add some HTML to the existing form */
 	$s .= '<span id="settings_forumlist_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_forumlist_expanded\'); openClose(\'settings_forumlist_inflated\');">';
-	$s .= '<h3>' . t('Forumlist Settings') . '</h3>';
+	$s .= '<h3>' . t('Forumlist') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_forumlist_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_forumlist_expanded\'); openClose(\'settings_forumlist_inflated\');">';
-	$s .= '<h3>' . t('Forumlist Settings') . '</h3>';
+	$s .= '<h3>' . t('Forumlist') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="forumlist-settings-wrapper">';
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 343edae7..ecdf7656 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -34,11 +34,11 @@ function fromgplus_addon_settings(&$a,&$s) {
 	$account = get_pconfig(local_user(),'fromgplus','account');
 
 	$s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
-	$s .= '<h3>' . t('Google+ Import Settings').'</h3>';
+	$s .= '<h3>' . t('Google+ Mirroring').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_fromgplus_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
-	$s .= '<h3>' . t('Google+ Import Settings').'</h3>';
+	$s .= '<h3>' . t('Google+ Mirroring').'</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="fromgplus-wrapper">';
diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php
index a66e1e45..c6f2b2eb 100644
--- a/gpluspost/gpluspost.php
+++ b/gpluspost/gpluspost.php
@@ -59,11 +59,11 @@ function gpluspost_settings(&$a,&$s) {
 	$skip_checked = (($skip_enabled) ? ' checked="checked" ' : '');
 
 	$s .= '<span id="settings_gpluspost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
-	$s .= '<h3>' . t('Google+ Post Settings') . '</h3>';
+	$s .= '<h3>' . t('Google+') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_gpluspost_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_gpluspost_expanded\'); openClose(\'settings_gpluspost_inflated\');">';
-	$s .= '<h3>' . t('Google+ Post Settings') . '</h3>';
+	$s .= '<h3>' . t('Google+') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="gpluspost-enable-wrapper">';
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 15cbb80c..f998acd1 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -295,11 +295,11 @@ function jappixmini_settings(&$a, &$s) {
     }
 
     $s .= '<span id="settings_jappixmini_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
-    $s .= '<h3>'.t('Jappix Mini addon settings').'</h3>';
+    $s .= '<h3>'.t('Jappix Mini').'</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_jappixmini_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
-    $s .= '<h3>'.t('Jappix Mini addon settings').'</h3>';
+    $s .= '<h3>'.t('Jappix Mini').'</h3>';
     $s .= '</span>';
 
     $s .= '<label for="jappixmini-activate">'.t('Activate addon').'</label>';
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 1a19b1dd..dec85ddb 100755
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -64,11 +64,11 @@ function libertree_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
-    $s .= '<h3>' . t('libertree Post Settings') . '</h3>';
+    $s .= '<h3>' . t('libertree') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
-    $s .= '<h3>' . t('libertree Post Settings') . '</h3>';
+    $s .= '<h3>' . t('libertree') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="libertree-enable-wrapper">';
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index d8a5926b..8e8c44c5 100755
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -75,11 +75,11 @@ function nsfw_addon_settings(&$a,&$s) {
 		$words = 'nsfw,';
 
     $s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
-    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter) settings') . '</h3>';
+    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_nsfw_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
-    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter) settings') . '</h3>';
+    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="nsfw-wrapper">';
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index fa28089f..0280b517 100755
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -219,11 +219,11 @@ function pumpio_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-    $s .= '<h3>' . t('Pump.io Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Pump.io') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-    $s .= '<h3>' . t('Pump.io Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Pump.io') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="pumpio-username-wrapper">';
diff --git a/snautofollow/snautofollow.php b/snautofollow/snautofollow.php
index 4afb8706..ca19d650 100644
--- a/snautofollow/snautofollow.php
+++ b/snautofollow/snautofollow.php
@@ -53,11 +53,11 @@ function snautofollow_settings(&$a,&$s) {
 	/* Add some HTML to the existing form */
 
 	$s .= '<span id="settings_snautofollow_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_snautofollow_expanded\'); openClose(\'settings_snautofollow_inflated\');">';
-	$s .= '<h3>' . t('StatusNet AutoFollow Settings') . '</h3>';
+	$s .= '<h3>' . t('StatusNet AutoFollow') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_snautofollow_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_snautofollow_expanded\'); openClose(\'settings_snautofollow_inflated\');">';
-	$s .= '<h3>' . t('StatusNet AutoFollow Settings') . '</h3>';
+	$s .= '<h3>' . t('StatusNet AutoFollow') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="snautofollow-wrapper">';
diff --git a/startpage/startpage.php b/startpage/startpage.php
index 6a95310e..e0d822ac 100644
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -79,8 +79,13 @@ function startpage_settings(&$a,&$s) {
 
 	/* Add some HTML to the existing form */
 
-	$s .= '<div class="settings-block">';
-	$s .= '<h3>' . t('Startpage Settings') . '</h3>';
+	$s .= '<span id="settings_startpage_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">';
+	$s .= '<h3>' . t('Startpage') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_startpage_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">';
+	$s .= '<h3>' . t('Startpage') . '</h3>';
+	$s .= '</span>';
 	$s .= '<div id="startpage-page-wrapper">';
 	$s .= '<label id="startpage-page-label" for="startpage-page">' . t('Home page to load after login  - leave blank for profile wall') . '</label>';
 	$s .= '<input id="startpage-page" type="text" name="startpage" value="' . $page . '" />';
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index a159e87a..d4120aaf 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -155,7 +155,7 @@ function statusnet_settings_post ($a,$post) {
 	    return;
 	// don't check statusnet settings if statusnet submit button is not clicked
 	if (!x($_POST,'statusnet-submit')) return;
-	
+
 	if (isset($_POST['statusnet-disconnect'])) {
             /***
              * if the statusnet-disconnect checkbox is set, clear the statusnet configuration
@@ -279,11 +279,11 @@ function statusnet_settings(&$a,&$s) {
 	$shorteningchecked = (($shorteningenabled) ? ' checked="checked" ' : '');
 
 	$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<h3>'. t('StatusNet Posting Settings').'</h3>';
+	$s .= '<h3>'. t('StatusNet').'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
-	$s .= '<h3>'. t('StatusNet Posting Settings').'</h3>';
+	$s .= '<h3>'. t('StatusNet').'</h3>';
 	$s .= '</span>';
 
 	if ( (!$ckey) && (!$csecret) ) {
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 0102d633..114fcc5b 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -182,11 +182,11 @@ function tumblr_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_tumblr_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
-    $s .= '<h3>' . t('Tumblr Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Tumblr') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_tumblr_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
-    $s .= '<h3>' . t('Tumblr Post Settings') . '</h3>';
+    $s .= '<h3>' . t('Tumblr') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="tumblr-username-wrapper">';
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 711a33fe..aeae1c2f 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -231,11 +231,11 @@ function twitter_settings(&$a,&$s) {
         $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
 
 	$s .= '<span id="settings_twitter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
-	$s .= '<h3>'. t('Twitter Settings') .'</h3>';
+	$s .= '<h3>'. t('Twitter') .'</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
-	$s .= '<h3>'. t('Twitter Settings') .'</h3>';
+	$s .= '<h3>'. t('Twitter') .'</h3>';
 	$s .= '</span>';
 
 	if ( (!$ckey) && (!$csecret) ) {
diff --git a/wppost/wppost.php b/wppost/wppost.php
index 4c862151..3c7c17b1 100755
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -73,11 +73,11 @@ function wppost_settings(&$a,&$s) {
     /* Add some HTML to the existing form */
 
     $s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
-    $s .= '<h3>' . t('WordPress Post Settings') . '</h3>';
+    $s .= '<h3>' . t('WordPress') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
-    $s .= '<h3>' . t('WordPress Post Settings') . '</h3>';
+    $s .= '<h3>' . t('WordPress') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="wppost-enable-wrapper">';
     $s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . t('Enable WordPress Post Plugin') . '</label>';
diff --git a/yourls/yourls.php b/yourls/yourls.php
index 1d781058..beea2619 100755
--- a/yourls/yourls.php
+++ b/yourls/yourls.php
@@ -52,11 +52,11 @@ function yourls_addon_settings(&$a,&$s) {
 	$yourls_ssl = get_config('yourls', 'ssl1');
 
 	$s .= '<span id="settings_yourls_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">';
-	$s .= '<h3>' . t('YourLS Settings') . '</h3>';
+	$s .= '<h3>' . t('YourLS') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_yourls_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_yourls_expanded\'); openClose(\'settings_yourls_inflated\');">';
-	$s .= '<h3>' . t('YourLS Settings') . '</h3>';
+	$s .= '<h3>' . t('YourLS') . '</h3>';
 	$s .= '</span>';
 
 	$s .= '<div id="yourls-url-wrapper">';