diff --git a/altpager/altpager.php b/altpager/altpager.php
index f185e4fe..c6f537bd 100755
--- a/altpager/altpager.php
+++ b/altpager/altpager.php
@@ -88,14 +88,14 @@ function altpager_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="altpager-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="altpager-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
 function altpager_plugin_admin(&$a, &$o){
 	$t = get_markup_template( "admin.tpl", "addon/altpager/" );
 	$o = replace_macros($t, array(
-		'$submit' => t('Save Settings'),
+		'$submit' => t('Submit'),
 		'$global' => array('altpagerchoice', t('Global'), 1, t('Force global use of the alternate pager'),  get_config('alt_pager', 'global') == 1),
 		'$individual' => array('altpagerchoice', t('Individual'), 2, t('Each user chooses whether to use the alternate pager'),  get_config('alt_pager', 'global') == 0)
 	));
diff --git a/appnetpost/appnetpost.php b/appnetpost/appnetpost.php
index c1b1f175..d3f6c19a 100644
--- a/appnetpost/appnetpost.php
+++ b/appnetpost/appnetpost.php
@@ -52,8 +52,14 @@ function appnetpost_settings(&$a,&$s) {
 	$def_enabled = get_pconfig(local_user(),'appnetpost','post_by_default');
 	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
 
-	$s .= '<div class="settings-block">';
+	$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 .= '</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 .= '</span>';
+
 	$s .= '<div id="appnetpost-enable-wrapper">';
 	$s .= '<label id="appnetpost-enable-label" for="appnetpost-checkbox">' . t('Enable App.net Post Plugin') . '</label>';
 	$s .= '<input id="appnetpost-checkbox" type="checkbox" name="appnetpost" value="1" ' . $checked . '/>';
diff --git a/blackout/blackout.php b/blackout/blackout.php
index 3678969e..e629b7a3 100644
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -96,7 +96,7 @@ function blackout_plugin_admin(&$a, &$o) {
     $t = get_markup_template( "admin.tpl", "addon/blackout/" );
  
    $o = replace_macros($t, array(
-        '$submit' => t('Save Settings'),
+        '$submit' => t('Submit'),
         '$rurl' => array("rurl", "Redirect URL", $myurl, "all your visitors from the web will be redirected to this URL"),
         '$startdate' => array("startdate", "Begin of the Blackout<br />(YYYY-MM-DD hh:mm)", $mystart, "format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"),
         '$enddate' => array("enddate", "End of the Blackout<br />(YYYY-MM-DD hh:mm)", $myend, ""),
diff --git a/blockem/blockem.php b/blockem/blockem.php
index 0276e2de..339c841a 100755
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -49,14 +49,20 @@ function blockem_addon_settings(&$a,&$s) {
 	if(! $words)
 		$words = '';
 
-    $s .= '<div class="settings-block">';
+    $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 .= '</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 .= '</span>';
+
     $s .= '<div id="blockem-wrapper">';
     $s .= '<label id="blockem-label" for="blockem-words">' . t('Comma separated profile URLS to block') . ' </label>';
     $s .= '<textarea id="blockem-words" type="text" name="blockem-words" >' . htmlspecialchars($words) . '</textarea>';
     $s .= '</div><div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blockem-submit" name="blockem-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blockem-submit" name="blockem-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 	return;
 
diff --git a/blogger/blogger.php b/blogger/blogger.php
index 67aae4a1..a182b468 100755
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -70,8 +70,14 @@ function blogger_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
+    $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 .= '</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 .= '</span>';
+
     $s .= '<div id="blogger-enable-wrapper">';
     $s .= '<label id="blogger-enable-label" for="blogger-checkbox">' . t('Enable Blogger Post Plugin') . '</label>';
     $s .= '<input id="blogger-checkbox" type="checkbox" name="blogger" value="1" ' . $checked . '/>';
@@ -99,7 +105,7 @@ function blogger_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blogger-submit" name="blogger-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blogger-submit" name="blogger-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/cal/cal.php b/cal/cal.php
index 79fbffd5..8841be43 100644
--- a/cal/cal.php
+++ b/cal/cal.php
@@ -184,8 +184,8 @@ function cal_addon_settings ( &$a, &$s  )
     $s .= '<label id="cal-enable-label" for="cal-checkbox">'. t('Enable calendar export') .'</label>';
     $s .= '<input id="cal-checkbox" type="checkbox" name="cal-enable" value="1" ' . $checked . '/>';
     $s .= '</div><div class="clear"></div>';
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="cal-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>'; 
-    $s .= '<div class="clear"></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="cal-submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; 
+    $s .= '</div><div class="clear"></div>';
 
 }
 
diff --git a/curweather/curweather.php b/curweather/curweather.php
index bd0d6c75..c935eb57 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -101,7 +101,7 @@ function curweather_plugin_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="curweather-settings-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="curweather-settings-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/defaultfeatures/defaultfeatures.php b/defaultfeatures/defaultfeatures.php
index dfe4a067..fbed22ee 100755
--- a/defaultfeatures/defaultfeatures.php
+++ b/defaultfeatures/defaultfeatures.php
@@ -52,7 +52,7 @@ function defaultfeatures_plugin_admin (&$a, &$o) {
     //logger("Features: " . print_r($arr,true));
 
     $o = replace_macros($t, array(
-        '$submit' => t('Save Settings'),
+        '$submit' => t('Submit'),
         '$features' => $arr,
         '$form_security_token' => $token
     ));
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 0c2e699a..2391b571 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -90,7 +90,7 @@ function dwpost_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/editplain/editplain.php b/editplain/editplain.php
index caa0f29d..966e2d8f 100755
--- a/editplain/editplain.php
+++ b/editplain/editplain.php
@@ -81,6 +81,6 @@ function editplain_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="editplain-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="editplain-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
diff --git a/facebook/facebook.php b/facebook/facebook.php
index ff9b52ea..4c1c0a14 100644
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -618,7 +618,7 @@ function facebook_content(&$a) {
 		$o .= '<div><label id="blocked-apps-label" for="blocked-apps">' . t('Comma separated applications to ignore') . ' </label></div>';
     	$o .= '<div><textarea id="blocked-apps" name="blocked_apps" >' . htmlspecialchars($blocked_apps) . '</textarea></div>';
 
-		$o .= '<input type="submit" name="submit" value="' . t('Save Settings') . '" /></form></div>';
+		$o .= '<input type="submit" name="submit" value="' . t('Submit') . '" /></form></div>';
 	}
 
 	return $o;
diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php
index 419055ac..cba2a028 100644
--- a/fbpost/fbpost.php
+++ b/fbpost/fbpost.php
@@ -279,7 +279,7 @@ function fbpost_content(&$a) {
 
 		$o .= "</select>";
 
-		$o .= '<p><input type="submit" name="submit" value="' . t('Save Settings') . '" /></form></div>';
+		$o .= '<p><input type="submit" name="submit" value="' . t('Submit') . '" /></form></div>';
 
 	}
 
@@ -808,10 +808,10 @@ function fbpost_post_hook(&$a,&$b) {
  */
 function fbpost_enotify(&$app, &$data) {
 	if (x($data, 'params') && $data['params']['type'] == NOTIFY_SYSTEM && x($data['params'], 'system_type') && $data['params']['system_type'] == 'facebook_connection_invalid') {
-		$data['itemlink'] = '/facebook';
+		$data['itemlink'] = '/fbpost';
 		$data['epreamble'] = $data['preamble'] = t('Your Facebook connection became invalid. Please Re-authenticate.');
 		$data['subject'] = t('Facebook connection became invalid');
-		$data['body'] = sprintf( t("Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."), $data['params']['to_name'], "[url=" . $app->config["system"]["url"] . "]" . $app->config["sitename"] . "[/url]", "[url=" . $app->config["system"]["url"] . "/facebook]", "[/url]");
+		$data['body'] = sprintf( t("Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."), $data['params']['to_name'], "[url=" . $app->config["system"]["url"] . "]" . $app->config["sitename"] . "[/url]", "[url=" . $app->config["system"]["url"] . "/fbpost]", "[/url]");
 	}
 }
 
diff --git a/fbsync/fbsync.php b/fbsync/fbsync.php
index d8b1c0c7..1b2fec0a 100644
--- a/fbsync/fbsync.php
+++ b/fbsync/fbsync.php
@@ -119,8 +119,13 @@ function fbsync_settings(&$a,&$s) {
 
 	/* Add some HTML to the existing form */
 
-	$s .= '<div class="settings-block">';
+	$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 .= '</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 .= '</span>';
 
 	$s .= '<div id="fbsync-enable-wrapper">';
 	$s .= '<label id="fbsync-enable-label" for="fbsync-checkbox">' . t('Import Facebook newsfeed') . '</label>';
@@ -134,7 +139,7 @@ function fbsync_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fbsync-submit" name="fbsync-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fbsync-submit" name="fbsync-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/forumlist/forumlist.php b/forumlist/forumlist.php
index 3e6648f9..18a59c52 100644
--- a/forumlist/forumlist.php
+++ b/forumlist/forumlist.php
@@ -154,12 +154,17 @@ function forumlist_plugin_settings(&$a,&$s) {
 
 	$network = intval(get_pconfig(local_user(),'forumlist','show_on_network'));
 	$network_checked = (($network) ? ' checked="checked" ' : '');
-	
-	
-	/* Add some HTML to the existing form */
 
-	$s .= '<div class="settings-block">';
+
+	/* 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 .= '</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 .= '</span>';
+
 	$s .= '<div id="forumlist-settings-wrapper">';
 	$s .= '<label id="forumlist-random-label" for="forumlist-random">' . t('Randomise forum list') . '</label>';
 	$s .= '<input id="forumlist-random" type="checkbox" name="forumlist_random" value="1" ' . $randomise_checked . '/>';
@@ -175,7 +180,7 @@ function forumlist_plugin_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="forumlist-settings-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="forumlist-settings-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 7a920dd3..9a9fa12b 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -74,7 +74,7 @@ function fromapp_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="fromapp-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="fromapp-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
@@ -98,4 +98,4 @@ function fromapp_post_hook(&$a,&$item) {
 	$item['app'] = trim($apps[mt_rand(0,count($apps)-1)]);
 	return;
 
-}
+}
\ No newline at end of file
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 97213d38..6817ab22 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -33,8 +33,14 @@ function fromgplus_addon_settings(&$a,&$s) {
 	$enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
 	$account = get_pconfig(local_user(),'fromgplus','account');
 
-	$s .= '<div class="settings-block">';
+	$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 .= '</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 .= '</span>';
+
 	$s .= '<div id="fromgplus-wrapper">';
 
 	$s .= '<label id="fromgplus-enable-label" for="fromgplus-enable">'.t('Enable Google+ Import').'</label>';
@@ -45,7 +51,7 @@ function fromgplus_addon_settings(&$a,&$s) {
 	$s .= '</div><div class="clear"></div>';
 
 	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fromgplus-submit" name="fromgplus-submit" 
-class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+class="settings-submit" value="' . t('Submit') . '" /></div>';
 	$s .= '</div>';
 
 	return;
diff --git a/geonames/geonames.php b/geonames/geonames.php
index c10653a7..19725bef 100755
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -184,6 +184,6 @@ function geonames_plugin_admin(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="geonames-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="geonames-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
diff --git a/gnot/gnot.php b/gnot/gnot.php
index fcdc7319..fd8fdfd9 100755
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -85,7 +85,7 @@ function gnot_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="gnot-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="gnot-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/gpluspost/gpluspost.php b/gpluspost/gpluspost.php
index 802ccb5b..4cbd0dce 100644
--- a/gpluspost/gpluspost.php
+++ b/gpluspost/gpluspost.php
@@ -58,8 +58,14 @@ function gpluspost_settings(&$a,&$s) {
 	$skip_enabled = get_pconfig(local_user(),'gpluspost','skip_without_link');
 	$skip_checked = (($skip_enabled) ? ' checked="checked" ' : '');
 
-	$s .= '<div class="settings-block">';
+	$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 .= '</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 .= '</span>';
+
 	$s .= '<div id="gpluspost-enable-wrapper">';
 	$s .= '<label id="gpluspost-enable-label" for="gpluspost-checkbox">' . t('Enable Google+ Post Plugin') . '</label>';
 	$s .= '<input id="gpluspost-checkbox" type="checkbox" name="gpluspost" value="1" ' . $checked . '/>';
@@ -82,7 +88,7 @@ function gpluspost_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="gpluspost-submit" name="gpluspost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="gpluspost-submit" name="gpluspost-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
 	$s .= '<p>Register an account at <a href="https://hootsuite.com">Hootsuite</a>, add your G+ page and add the feed-url there.<br />';
 	$s .= 'Feed-url: '.$a->get_baseurl().'/gpluspost/'.urlencode($a->user["nickname"]).'</p></div>';
 }
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index c23d1b30..12a8e44f 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -92,7 +92,7 @@ function gravatar_plugin_admin (&$a, &$o) {
 	// output Gravatar settings
 	$o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("gravatarsave") .'">';
 	$o .= replace_macros( $t, array(
-		'$submit' => t('Save Settings'),
+		'$submit' => t('Submit'),
 		'$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars),
 		'$rating' => array('rating', t('Rating of images'), $rating, t('Select the appropriate avatar rating for your site. See README'), $ratings),
 	));
diff --git a/group_text/group_text.php b/group_text/group_text.php
index 29b0675f..5ec5c9c2 100755
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -81,6 +81,6 @@ function group_text_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="group_text-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="group_text-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 9d7732f1..d6861f46 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -90,7 +90,7 @@ function ijpost_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/impressum/impressum.php b/impressum/impressum.php
index dcd6acff..6714dfc1 100755
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -88,7 +88,7 @@ function impressum_plugin_admin_post (&$a) {
 function impressum_plugin_admin (&$a, &$o) {
     $t = get_markup_template( "admin.tpl", "addon/impressum/" );
     $o = replace_macros($t, array(
-        '$submit' => t('Save Settings'),
+        '$submit' => t('Submit'),
         '$owner' => array('owner', t('Site Owner'), get_config('impressum','owner'), t('The page operators name.')),
         '$ownerprofile' => array('ownerprofile', t('Site Owners Profile'), get_config('impressum','ownerprofile'), t('Profile address of the operator.')),
         '$postal' => array('postal', t('Postal Address'), get_config('impressum','postal'), t('How to contact the operator via snail mail. You can use BBCode here.')),
diff --git a/irc/irc.php b/irc/irc.php
index ef9c3fda..bd7444a9 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -52,7 +52,7 @@ function irc_addon_settings(&$a,&$s) {
 	$s .= '<input id="irc-sitechats" type="text" name="sitechats" value="' . $sitechats.'" />';
 	$s .= '</div><div class="clear"></div>';
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="irc-submit" name="irc-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="irc-submit" name="irc-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 	return;
 
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 7b8b8596..e7b81183 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -294,10 +294,14 @@ function jappixmini_settings(&$a, &$s) {
         $a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/lib.js"></script>'."\r\n";
     }
 
-    $s .= '<div class="settings-block">';
-
+    $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 .= '<div>';
+    $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 .= '</span>';
+
     $s .= '<label for="jappixmini-activate">'.t('Activate addon').'</label>';
     $s .= ' <input id="jappixmini-activate" type="checkbox" name="jappixmini-activate" value="1"'.$activate.' />';
     $s .= '<br />';
@@ -340,7 +344,7 @@ function jappixmini_settings(&$a, &$s) {
     $s .= '<br />';
     if ($info_text) $s .= '<br />Configuration help:<p style="margin-left:2em;">'.$info_text.'</p>';
     $s .= '<br />Status:<p style="margin-left:2em;">Addon knows '.$address_cnt.' Jabber addresses of '.$contact_cnt.' Friendica contacts (takes some time, usually 10 minutes, to update).</p>';
-    $s .= '<input type="submit" name="jappixmini-submit" value="' . t('Save Settings') . '" />';
+    $s .= '<input type="submit" name="jappixmini-submit" value="' . t('Submit') . '" />';
     $s .= ' <input type="button" value="'.t('Add contact').'" onclick="jappixmini_addon_subscribe();" />';
     $s .= '</div>';
 
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 3029c60a..2783c6be 100755
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -63,8 +63,14 @@ function libertree_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
+    $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 .= '</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 .= '</span>';
+
     $s .= '<div id="libertree-enable-wrapper">';
     $s .= '<label id="libertree-enable-label" for="libertree-checkbox">' . t('Enable Libertree Post Plugin') . '</label>';
     $s .= '<input id="libertree-checkbox" type="checkbox" name="libertree" value="1" ' . $checked . '/>';
@@ -87,7 +93,7 @@ function libertree_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="libertree-submit" name="libertree-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="libertree-submit" name="libertree-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index d958dba4..8cbf1e98 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -96,7 +96,7 @@ function libravatar_plugin_admin (&$a, &$o) {
 	// output Libravatar settings
 	$o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("libravatarsave") .'">';
 	$o .= replace_macros( $t, array(
-		'$submit' => t('Save Settings'),
+		'$submit' => t('Submit'),
 		'$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found. See README'), $default_avatars),
 	));
 }
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index c8690c26..dc17e83f 100755
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -90,7 +90,7 @@ function ljpost_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ljpost-submit" name="ljpost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ljpost-submit" name="ljpost-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 5e476784..04760385 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -57,7 +57,7 @@ function mailstream_plugin_admin(&$a,&$o) {
                     t('Email address that stream items will appear to be from.'));
     $o .= replace_macros($template, array(
                              '$frommail' => $config,
-                             '$submit' => t('Save Settings')));
+                             '$submit' => t('Submit')));
 }
 
 function mailstream_plugin_admin_post ($a) {
@@ -279,7 +279,7 @@ function mailstream_plugin_settings(&$a,&$s) {
                                  t('Enabled'),
                                  $enabled),
                              '$title' => t('Mail Stream Settings'),
-                             '$submit' => t('Save Settings')));
+                             '$submit' => t('Submit')));
 }
 
 function mailstream_plugin_settings_post($a,$post) {
diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index 045f4c6a..d97e9649 100644
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -39,7 +39,7 @@ function mathjax_settings (&$a, &$s) {
     $s .= '<input id="mathjax_use" type="checkbox" name="mathjax_use" value="1"'. $usetext .' />';
     $s .= '<div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="mathjax-submit" name="mathjax-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="mathjax-submit" name="mathjax-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
     $s .= '</div>';
 }
 /*  we need to add one JavaScript include command to the html output
@@ -72,7 +72,7 @@ function mathjax_plugin_admin (&$a, &$o) {
 	}
 
 	$o = replace_macros( $t, array(
-		'$submit' => t('Save Settings'),
+		'$submit' => t('Submit'),
 		'$baseurl' => array('baseurl', t('MathJax Base URL'), get_config('mathjax','baseurl' ), t('The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax.')),
 	));
 }
diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php
index c2bca211..7e26bf92 100644
--- a/notimeline/notimeline.php
+++ b/notimeline/notimeline.php
@@ -61,6 +61,6 @@ function notimeline_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="notimeline-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="notimeline-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 5e7d4e9f..7e233cc1 100755
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -74,8 +74,14 @@ function nsfw_addon_settings(&$a,&$s) {
 	if(! $words)
 		$words = 'nsfw,';
 
-    $s .= '<div class="settings-block">';
+    $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 .= '</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 .= '</span>';
+
     $s .= '<div id="nsfw-wrapper">';
     $s .= '<p>' . t ('This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter.') . '</p>';
     $s .= '<label id="nsfw-enable-label" for="nsfw-enable">' . t('Enable Content filter') . ' </label>';
@@ -85,7 +91,7 @@ function nsfw_addon_settings(&$a,&$s) {
     $s .= '<input id="nsfw-words" type="text" name="nsfw-words" value="' . $words .'" />';
     $s .= '</div><div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
 	$s .= '<div class="nsfw-desc">' . t('Use /expression/ to provide regular expressions') . '</div></div>';
 
 	return;
diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 2f48a0d7..6ca7b395 100755
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -82,6 +82,6 @@ function numfriends_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="numfriends-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="numfriends-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index ccb177ab..2c5975eb 100755
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -91,7 +91,7 @@ function openstreetmap_plugin_admin (&$a, &$o) {
 		$zoom = 17;
 
 	$o = replace_macros( $t, array(
-			'$submit' => t('Save Settings'),
+			'$submit' => t('Submit'),
 			'$tmsserver' => array('tmsserver', t('Tile Server URL'), $tmsserver, t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')),
 			'$zoom' => array('zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest)')),
 	));
diff --git a/page/page.php b/page/page.php
index 86607e81..21a83e16 100755
--- a/page/page.php
+++ b/page/page.php
@@ -208,7 +208,7 @@ function page_plugin_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="page-settings-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="page-settings-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 947926cd..cf92204a 100755
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -52,7 +52,7 @@ function pageheader_addon_settings(&$a,&$s) {
     $s .= '<input id="pageheader-words" type="text" size="80" name="pageheader-words" value="' . $words .'" />';
     $s .= '</div><div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pageheader-submit" name="pageheader-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 	return;
 
diff --git a/piwik/piwik.php b/piwik/piwik.php
index 21bc7af2..a2086bdc 100755
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -84,7 +84,7 @@ function piwik_analytics($a,&$b) {
 function piwik_plugin_admin (&$a, &$o) {
 	$t = get_markup_template( "admin.tpl", "addon/piwik/" );
 	$o = replace_macros( $t, array(
-		'$submit' => t('Save Settings'),
+		'$submit' => t('Submit'),
 		'$baseurl' => array('baseurl', t('Piwik Base URL'), get_config('piwik','baseurl' ), t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')),
 		'$siteid' => array('siteid', t('Site ID'), get_config('piwik','siteid' ), ''),
 		'$optout' => array('optout', t('Show opt-out cookie link?'), get_config('piwik','optout' ), ''),
diff --git a/planets/planets.php b/planets/planets.php
index 72698cb9..0df91d7c 100755
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -155,6 +155,6 @@ function planets_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="planets-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="planets-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
diff --git a/posterous/posterous.php b/posterous/posterous.php
index af8e72b9..7ff95948 100755
--- a/posterous/posterous.php
+++ b/posterous/posterous.php
@@ -100,7 +100,7 @@ function posterous_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="posterous-submit" name="posterous-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="posterous-submit" name="posterous-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 9b7f80ed..830be6a1 100755
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -218,8 +218,13 @@ function pumpio_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
+    $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 .= '</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 .= '</span>';
 
     $s .= '<div id="pumpio-username-wrapper">';
     $s .= '<label id="pumpio-username-label" for="pumpio-username">'.t('pump.io username (without the servername)').'</label>';
@@ -278,7 +283,7 @@ function pumpio_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
@@ -712,8 +717,13 @@ function pumpio_fetchtimeline(&$a, $uid) {
 
 				$_REQUEST["body"] = html2bbcode($post->object->content);
 
-				if ($post->object->fullImage->url != "")
-					$_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"];
+				// To-Do: Picture has to be cached and stored locally
+				if ($post->object->fullImage->url != "") {
+					if ($post->object->fullImage->pump_io->proxyURL != "")
+						$_REQUEST["body"] = "[url=".$post->object->fullImage->pump_io->proxyURL."][img]".$post->object->image->pump_io->proxyURL."[/img][/url]\n".$_REQUEST["body"];
+					else
+						$_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"];
+				}
 
 				logger('pumpio: posting for user '.$uid);
 
diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index 2c98cba7..6b372579 100755
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -58,7 +58,7 @@ function qcomment_addon_settings(&$a,&$s) {
     $s .= '<textarea id="qcomment-words" type="text" name="qcomment-words" >' . htmlspecialchars(unxmlify($words)) . '</textarea>';
     $s .= '</div><div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="qcomment-submit" name="qcomment-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="qcomment-submit" name="qcomment-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
 	$s .= '</div>';
 
 	return;
diff --git a/randplace/randplace.php b/randplace/randplace.php
index 27589b1c..b70c02d9 100755
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -174,6 +174,6 @@ function randplace_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
index 5cba005a..8955130f 100644
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -45,7 +45,7 @@ function remote_permissions_settings(&$a,&$o) {
 		'$remote_perms_title' => t('Remote Permissions Settings'),
 		'$remote_perms_label' => t('Allow recipients of your private posts to see the other recipients of the posts'),
 		'$checked' => (($remote_perms == 1) ? 'checked="checked"' : ''),
-		'$submit' => t('Save Settings')
+		'$submit' => t('Submit')
 	));
 
 }
@@ -193,7 +193,7 @@ function remote_permissions_content($a, $item_copy) {
 function remote_permissions_plugin_admin(&$a, &$o){
 	$t = get_markup_template( "admin.tpl", "addon/remote_permissions/" );
 	$o = replace_macros($t, array(
-		'$submit' => t('Save Settings'),
+		'$submit' => t('Submit'),
 		'$global' => array('remotepermschoice', t('Global'), 1, t('The posts of every user on this server show the post recipients'),  get_config('remote_perms', 'global') == 1),
 		'$individual' => array('remotepermschoice', t('Individual'), 2, t('Each user chooses whether his/her posts show the post recipients'),  get_config('remote_perms', 'global') == 0)
 	));
diff --git a/retriever/retriever.php b/retriever/retriever.php
index 04834018..1090c8b5 100644
--- a/retriever/retriever.php
+++ b/retriever/retriever.php
@@ -674,7 +674,7 @@ function retriever_content($a) {
                                                       t('Reapply the rules to this number of posts')),
                                                   '$title' => t('Retrieve Feed Content'),
                                                   '$help' => $a->get_baseurl() . '/retriever/help',
-                                                  '$submit' => t('Save Settings'),
+                                                  '$submit' => t('Submit'),
                                                   '$id' => ($retriever["id"] ? $retriever["id"] : "create"),
                                                   '$tag_t' => t('Tag'),
                                                   '$attribute_t' => t('Attribute'),
@@ -718,7 +718,7 @@ function retriever_plugin_settings(&$a,&$s) {
     $all_photos_mu = ($all_photos == 'on') ? ' checked="true"' : '';
     $template = get_markup_template('/settings.tpl', 'addon/retriever/');
     $s .= replace_macros($template, array(
-                             '$submit' => t('Save Settings'),
+                             '$submit' => t('Submit'),
                              '$title' => t('Retriever Settings'),
                              '$help' => $a->get_baseurl() . '/retriever/help',
                              '$all_photos' => $all_photos_mu,
diff --git a/showmore/showmore.php b/showmore/showmore.php
index 60932ed3..bd9a8992 100755
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -34,8 +34,14 @@ function showmore_addon_settings(&$a,&$s) {
 	if(!$chars)
 		$chars = '1100';
 
-	$s .= '<div class="settings-block">';
+	$s .= '<span id="settings_showmore_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_showmore_expanded\'); openClose(\'settings_showmore_inflated\');">';
 	$s .= '<h3>' . t('"Show more" Settings').'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_showmore_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_showmore_expanded\'); openClose(\'settings_showmore_inflated\');">';
+	$s .= '<h3>' . t('"Show more" Settings').'</h3>';
+	$s .= '</span>';
+
 	$s .= '<div id="showmore-wrapper">';
 
 	$s .= '<label id="showmore-enable-label" for="showmore-enable">'.t('Enable Show More').'</label>';
@@ -45,7 +51,7 @@ function showmore_addon_settings(&$a,&$s) {
 	$s .= '<input id="showmore-words" type="text" name="showmore-chars" value="'.$chars.'" />';
 	$s .= '</div><div class="clear"></div>';
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="showmore-submit" name="showmore-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="showmore-submit" name="showmore-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
 //	$s .= '<div class="showmore-desc">' . t('Use /expression/ to provide regular expressions') . '</div>';
 	$s .= '</div>';
 
diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index d53794b9..87db098b 100755
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -278,6 +278,6 @@ function smileybutton_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="smileybutton-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="smileybutton-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
diff --git a/snautofollow/snautofollow.php b/snautofollow/snautofollow.php
index 4555ab1c..6694c38f 100644
--- a/snautofollow/snautofollow.php
+++ b/snautofollow/snautofollow.php
@@ -49,11 +49,17 @@ function snautofollow_settings(&$a,&$s) {
 
 	$snautofollow_checked = (($snautofollow) ? ' checked="checked" ' : '');
 
-	
+
 	/* Add some HTML to the existing form */
 
-	$s .= '<div class="settings-block">';
+	$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 .= '</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 .= '</span>';
+
 	$s .= '<div id="snautofollow-wrapper">';
 	$s .= '<label id="snautofollow-label" for="snautofollow-checkbox">' . t('Automatically follow any StatusNet followers/mentioners') . '</label>';
 	$s .= '<input id="snautofollow-checkbox" type="checkbox" name="snautofollow" value="1" ' . $snautofollow_checked . '/>';
@@ -61,6 +67,6 @@ function snautofollow_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="snautofollow-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="snautofollow-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
diff --git a/startpage/startpage.php b/startpage/startpage.php
index 6a95310e..85988298 100644
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -89,6 +89,6 @@ function startpage_settings(&$a,&$s) {
 
 	/* provide a submit button */
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="startpage-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="startpage-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 4a6f440c..53b6433c 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -278,8 +278,13 @@ function statusnet_settings(&$a,&$s) {
 	$shorteningenabled = get_pconfig(local_user(),'statusnet','intelligent_shortening');
 	$shorteningchecked = (($shorteningenabled) ? ' checked="checked" ' : '');
 
-	$s .= '<div class="settings-block">';
+	$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 .= '</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 .= '</span>';
 
 	if ( (!$ckey) && (!$csecret) ) {
 		/***
@@ -300,7 +305,7 @@ function statusnet_settings(&$a,&$s) {
                     $s .= '<input type="radio" name="statusnet-preconf-apiurl" value="'. $asn['apiurl'] .'">'. $asn['sitename'] .'<br />';
                 }
                 $s .= '<p></p><div class="clear"></div></div>';
-                $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+                $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
             }
             $s .= '<h4>' . t('Provide your own OAuth Credentials') . '</h4>';
             $s .= '<p>'. t('No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation.') .'</p>';
@@ -317,7 +322,7 @@ function statusnet_settings(&$a,&$s) {
             $s .= '<label id="statusnet-applicationname-label" for="statusnet-applicationname">'.t('StatusNet application name').'</label>';
             $s .= '<input id="statusnet-applicationname" type="text" name="statusnet-applicationname" size="35" /><br />';
             $s .= '<p></p><div class="clear"></div>';
-            $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+            $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
             $s .= '</div>';
 	} else {
 		/***
@@ -344,14 +349,14 @@ function statusnet_settings(&$a,&$s) {
 			$s .= '<input id="statusnet-token" type="hidden" name="statusnet-token" value="'.$token.'" />';
 			$s .= '<input id="statusnet-token2" type="hidden" name="statusnet-token2" value="'.$request_token['oauth_token_secret'].'" />';
 			$s .= '</div><div class="clear"></div>';
-			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
 			$s .= '<h4>'.t('Cancel Connection Process').'</h4>';
 			$s .= '<div id="statusnet-cancel-wrapper">';
 			$s .= '<p>'.t('Current StatusNet API is').': '.$api.'</p>';
 			$s .= '<label id="statusnet-cancel-label" for="statusnet-cancel">'. t('Cancel StatusNet Connection') . '</label>';
 			$s .= '<input id="statusnet-cancel" type="checkbox" name="statusnet-disconnect" value="1" />';
 			$s .= '</div><div class="clear"></div>';
-			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
 		} else {
 			/***
 			 *  we have an OAuth key / secret pair for the user
@@ -388,7 +393,7 @@ function statusnet_settings(&$a,&$s) {
                         $s .= '<label id="statusnet-disconnect-label" for="statusnet-disconnect">'. t('Clear OAuth configuration') .'</label>';
                         $s .= '<input id="statusnet-disconnect" type="checkbox" name="statusnet-disconnect" value="1" />';
 			$s .= '</div><div class="clear"></div>';
-			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>'; 
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; 
 		}
 	}
         $s .= '</div><div class="clear"></div>';
@@ -814,7 +819,7 @@ function statusnet_plugin_admin(&$a, &$o){
 
 	$t = get_markup_template( "admin.tpl", "addon/statusnet/" );
 	$o = replace_macros($t, array(
-		'$submit' => t('Save Settings'),
+		'$submit' => t('Submit'),
 		'$sites' => $sitesform,
 	));
 }
diff --git a/superblock/superblock.php b/superblock/superblock.php
index 1462c184..7363c139 100755
--- a/superblock/superblock.php
+++ b/superblock/superblock.php
@@ -55,7 +55,7 @@ function superblock_addon_settings(&$a,&$s) {
     $s .= '<textarea id="superblock-words" type="text" name="superblock-words" >' . htmlspecialchars($words) . '</textarea>';
     $s .= '</div><div class="clear"></div>';
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="superblock-submit" name="superblock-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="superblock-submit" name="superblock-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 	return;
 
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index b4db1055..19fe6995 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -181,8 +181,13 @@ function tumblr_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
+    $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 .= '</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 .= '</span>';
 
     $s .= '<div id="tumblr-username-wrapper">';
     $s .= '<a href="'.$a->get_baseurl().'/tumblr/connect">'.t("(Re-)Authenticate your tumblr page").'</a>';
@@ -231,7 +236,7 @@ function tumblr_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="tumblr-submit" name="tumblr-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="tumblr-submit" name="tumblr-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 42a373b8..e90f36df 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -264,7 +264,7 @@ function twitter_settings(&$a,&$s) {
 			$s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="'.$token.'" />';
 			$s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="'.$request_token['oauth_token_secret'].'" />';
             $s .= '</div><div class="clear"></div>';
-            $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
+            $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
 		} else {
 			/***
 			 *  we have an OAuth key / secret pair for the user
@@ -310,7 +310,7 @@ function twitter_settings(&$a,&$s) {
                         $s .= '<label id="twitter-disconnect-label" for="twitter-disconnect">'. t('Clear OAuth configuration') .'</label>';
                         $s .= '<input id="twitter-disconnect" type="checkbox" name="twitter-disconnect" value="1" />';
 			$s .= '</div><div class="clear"></div>';
-			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>'; 
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; 
 		}
 	}
         $s .= '</div><div class="clear"></div>';
@@ -863,7 +863,7 @@ function twitter_plugin_admin(&$a, &$o){
 	$t = get_markup_template( "admin.tpl", "addon/twitter/" );
 
 	$o = replace_macros($t, array(
-		'$submit' => t('Save Settings'),
+		'$submit' => t('Submit'),
 								// name, label, value, help, [extra values]
 		'$consumerkey' => array('consumerkey', t('Consumer key'),  get_config('twitter', 'consumerkey' ), ''),
                 '$consumersecret' => array('consumersecret', t('Consumer secret'),  get_config('twitter', 'consumersecret' ), ''),
diff --git a/uhremotestorage/uhremotestorage.php b/uhremotestorage/uhremotestorage.php
index 8dfecc74..85d6b13e 100755
--- a/uhremotestorage/uhremotestorage.php
+++ b/uhremotestorage/uhremotestorage.php
@@ -86,7 +86,7 @@ function uhremotestorage_settings($a, &$s){
 		'$auth'	=> array( 'unhoestedauth', t('OAuth end-point'), $auth, 'If your are using ownCloud, your OAuth endpoint will be like <tt>http://<i>HOST</i>/apps/remoteStorage/auth.php/<i>USER</i></tt>'),
 		'$api'	=> array( 'unhoestedapi', t('Api'), $api, 'If your are using ownCloud, your api will be <tt>WebDAV</tt>', $arr_api),
 		
-		'$submit' => t('Save Settings'),
+		'$submit' => t('Submit'),
 	));
 	
 }
diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php
index 8b3a243e..e0d33393 100644
--- a/webrtc/webrtc.php
+++ b/webrtc/webrtc.php
@@ -23,7 +23,7 @@ function webrtc_app_menu($a,&$b) {
 function webrtc_plugin_admin (&$a, &$o) {
         $t = get_markup_template( "admin.tpl", "addon/webrtc/" );
 	$o = replace_macros( $t, array(
-	    '$submit' => t('Save Settings'),
+	    '$submit' => t('Submit'),
 	    '$webrtcurl' => array('webrtcurl', t('WebRTC Base URL'), get_config('webrtc','webrtcurl' ), t('Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .')),
 	));
 }
diff --git a/wppost/wppost.php b/wppost/wppost.php
index 18656879..05cf60d0 100755
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -72,8 +72,13 @@ function wppost_settings(&$a,&$s) {
 
     /* Add some HTML to the existing form */
 
-    $s .= '<div class="settings-block">';
+    $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 .= '</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 .= '</span>';
     $s .= '<div id="wppost-enable-wrapper">';
     $s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . t('Enable WordPress Post Plugin') . '</label>';
     $s .= '<input id="wppost-checkbox" type="checkbox" name="wppost" value="1" ' . $checked . '/>';
@@ -107,7 +112,7 @@ function wppost_settings(&$a,&$s) {
 
     /* provide a submit button */
 
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="wppost-submit" name="wppost-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="wppost-submit" name="wppost-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 }
 
diff --git a/yourls/yourls.php b/yourls/yourls.php
index 06397cbb..d548504f 100755
--- a/yourls/yourls.php
+++ b/yourls/yourls.php
@@ -49,10 +49,16 @@ function yourls_addon_settings(&$a,&$s) {
 
 
 
-$yourls_ssl = get_config('yourls', 'ssl1');
+	$yourls_ssl = get_config('yourls', 'ssl1');
 
-	$s .= '<div class="settings-block">';
+	$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 .= '</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 .= '</span>';
+
 	$s .= '<div id="yourls-url-wrapper">';
 	$s .= '<label id="yourls-url-label" for="yourls-url">' . t('URL: http://') . '</label>';
 	$s .= '<input id="yourls-url" type="text" name="yourls_url" value="' . $yourls_url .'" />';
@@ -73,7 +79,7 @@ $yourls_ssl = get_config('yourls', 'ssl1');
 	$s .= '<input id="yourls-ssl" type="checkbox" name="yourls_ssl" value="1" ' . $ssl_checked . ' />';
 	$s .= '</div><div class="clear"></div>';
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="yourls-submit" name="yourls-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="yourls-submit" name="yourls-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
 
 	return;