diff --git a/class/convert.php b/class/convert.php
index 9d342f0..090189a 100644
--- a/class/convert.php
+++ b/class/convert.php
@@ -200,13 +200,13 @@ class MCI_Footnotes_Convert {
 			printf("</pre>");
 
 		} else if (is_numeric($p_mixed_Value) || is_int($p_mixed_Value)) {
-			echo $p_mixed_Value;
+			var_dump($p_mixed_Value);
 
 		} else if (is_date($p_mixed_Value)) {
-			echo $p_mixed_Value;
+			var_dump($p_mixed_Value);
 
 		} else {
-			echo $p_mixed_Value;
+			var_dump($p_mixed_Value);
 		}
 		echo "<br/>";
 	}
diff --git a/class/dashboard/init.php b/class/dashboard/init.php
index 6bca181..e983012 100644
--- a/class/dashboard/init.php
+++ b/class/dashboard/init.php
@@ -141,10 +141,14 @@ class MCI_Footnotes_Layout_Init {
 	 * @since 1.5.0
 	 */
 	public function displayOtherPlugins() {
-		printf("<br/>");
-		printf("<h3>%s</h3>", __('Take a look on other Plugins we have developed.', MCI_Footnotes_Config::C_STR_PLUGIN_NAME));
+		printf("<br/><br/>");
+		// load template file
+		$l_obj_Template = new MCI_Footnotes_Template(MCI_Footnotes_Template::C_STR_DASHBOARD, "manfisher");
+		echo $l_obj_Template->getContent();
+
 		printf('<em><a href="http://manfisher.net/" target="_blank">visit ManFisher Medien ManuFaktur</a></em>');
 		printf("<br/><br/>");
+		printf("<h3>%s</h3>", __('Take a look on other Plugins we have developed.', MCI_Footnotes_Config::C_STR_PLUGIN_NAME));
 /*
 		// collect plugin list as JSON
 		$l_arr_Response = wp_remote_get("http://herndler.org/wordpress/plugins/get.json");
@@ -204,22 +208,30 @@ class MCI_Footnotes_Layout_Init {
 		$l_arr_Response = wp_remote_get($l_str_Url);
 		// check if response is valid
 		if (is_wp_error($l_arr_Response)) {
-			echo json_encode(array("error" => "Can't get Plugin information."));
+			echo json_encode(array("error" => "Error receiving Plugin Information from WordPress."));
+			exit;
+		}
+		if (!array_key_exists("body", $l_arr_Response)) {
+			echo json_encode(array("error" => "Error reading WordPress API response message."));
 			exit;
 		}
 		// get the body of the response
 		$l_str_Response = $l_arr_Response["body"];
 		// get plugin object
 		$l_arr_Plugin = json_decode($l_str_Response, true);
+		if (empty($l_arr_Plugin)) {
+			echo json_encode(array("error" => "Error reading Plugin meta information."));
+			exit;
+		}
 
 		// return Plugin information as JSON encoded string
 		echo json_encode(
 			array(
 				"error" => "",
 				"PluginImage" => "",
-				"PluginDescription" => html_entity_decode($l_arr_Plugin["short_description"]),
-				"PluginUrl" => $l_arr_Plugin["homepage"],
-				"PluginVersion" => $l_arr_Plugin["version"]
+				"PluginDescription" => array_key_exists("short_description", $l_arr_Plugin) ? html_entity_decode($l_arr_Plugin["short_description"]) : "Error reading Plugin information",
+				"PluginUrl" => array_key_exists("homepage", $l_arr_Plugin) ? $l_arr_Plugin["homepage"] : "",
+				"PluginVersion" => array_key_exists("version", $l_arr_Plugin) ? $l_arr_Plugin["version"] : "---"
 			)
 		);
 		exit;
diff --git a/class/dashboard/layout.php b/class/dashboard/layout.php
index ba1259d..291253b 100644
--- a/class/dashboard/layout.php
+++ b/class/dashboard/layout.php
@@ -216,6 +216,8 @@ abstract class MCI_Footnotes_LayoutEngine {
 		$l_bool_SettingsUpdated = false;
 		if (array_key_exists("save-settings", $_POST)) {
 			if ($_POST["save-settings"] == "save") {
+				unset($_POST["save-settings"]);
+				unset($_POST["submit"]);
 				$l_bool_SettingsUpdated = $this->saveSettings();
 			}
 		}
@@ -239,7 +241,7 @@ abstract class MCI_Footnotes_LayoutEngine {
 
 		// form to submit the active section
 		echo '<!--suppress HtmlUnknownTarget --><form method="post" action="">';
-		settings_fields($l_arr_ActiveSection["container"]);
+		//settings_fields($l_arr_ActiveSection["container"]);
 		echo '<input type="hidden" name="save-settings" value="save" />';
 		// outputs the settings field of the active section
 		do_settings_sections($l_arr_ActiveSection["id"]);
@@ -270,19 +272,12 @@ abstract class MCI_Footnotes_LayoutEngine {
 	 * @return bool
 	 */
 	private function saveSettings() {
-		// get only Footnotes settings
-		$l_arr_Settings = array();
-		foreach($_POST as $l_str_SettingsName => $l_str_Value) {
-			if (substr($l_str_SettingsName, 0, 8) == "footnote") {
-				$l_arr_Settings[$l_str_SettingsName] = $l_str_Value;
-			}
-		}
 		// get current section
 		reset($this->a_arr_Sections);
 		$l_str_ActiveSectionID = isset($_GET['t']) ? $_GET['t'] : key($this->a_arr_Sections);
 		$l_arr_ActiveSection = $this->a_arr_Sections[$l_str_ActiveSectionID];
 		// update settings
-		return MCI_Footnotes_Settings::instance()->saveOptions($l_arr_ActiveSection["container"], $l_arr_Settings);
+		return MCI_Footnotes_Settings::instance()->saveOptions($l_arr_ActiveSection["container"], $_POST);
 	}
 
 	/**
diff --git a/class/dashboard/subpage-diagnostics.php b/class/dashboard/subpage-diagnostics.php
index b8ba7fd..2baceae 100644
--- a/class/dashboard/subpage-diagnostics.php
+++ b/class/dashboard/subpage-diagnostics.php
@@ -90,6 +90,10 @@ class MCI_Footnotes_Layout_Diagnostics extends MCI_Footnotes_LayoutEngine {
 			}
 			$l_str_PhpExtensions .= $l_str_Extension . ' ' . phpversion($l_str_Extension);
 		}
+
+		/** @var WP_Theme $l_obj_CurrentTheme */
+		$l_obj_CurrentTheme = wp_get_theme();
+
 		$l_str_WordPressPlugins = "";
 		// iterate through each installed WordPress Plugin
 		foreach (get_plugins() as $l_arr_Plugin) {
@@ -121,6 +125,9 @@ class MCI_Footnotes_Layout_Diagnostics extends MCI_Footnotes_LayoutEngine {
 				"label-wordpress" => __("WordPress version", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
 				"wordpress" => $wp_version,
 
+				"label-theme" => __("Active Theme", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+				"theme" => $l_obj_CurrentTheme->get("Name") . " " . $l_obj_CurrentTheme->get("Version") . ", " . $l_obj_CurrentTheme->get("Author"). " [" . $l_obj_CurrentTheme->get("AuthorURI") . "]",
+
 				"plugins" => $l_str_WordPressPlugins
 			)
 		);
diff --git a/class/dashboard/subpage-main.php b/class/dashboard/subpage-main.php
index 88aa892..23dd341 100644
--- a/class/dashboard/subpage-main.php
+++ b/class/dashboard/subpage-main.php
@@ -78,6 +78,7 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
 			$this->addMetaBox("settings", "other", __("Other", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "Other"),
 
 			$this->addMetaBox("customize", "superscript", __("Superscript layout", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "Superscript"),
+			$this->addMetaBox("customize", "mouse-over-box", __("Mouse-over box", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "MouseOverBox"),
 			$this->addMetaBox("customize", "hyperlink-arrow", __("Hyperlink symbol in the Reference container", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "HyperlinkArrow"),
 			$this->addMetaBox("customize", "custom-css", __("Add custom CSS to the public page", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "CustomCSS"),
 
@@ -270,6 +271,31 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
 		echo $l_obj_Template->getContent();
 	}
 
+	/**
+	 * Displays all settings for the footnotes mouse-over box.
+	 *
+	 * @author Stefan Herndler
+	 * @since 1.5.2
+	 */
+	public function MouseOverBox() {
+		// options for the Footnotes to be replaced in excerpt
+		$l_arr_Enabled = array(
+			"yes" => __("Yes", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+			"no" => __("No", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)
+		);
+		// load template file
+		$l_obj_Template = new MCI_Footnotes_Template(MCI_Footnotes_Template::C_STR_DASHBOARD, "customize-mouse-over-box");
+		// replace all placeholders
+		$l_obj_Template->replace(
+			array(
+				"label-enable" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ENABLED, __("Enable the mouse-over box", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)),
+				"enable" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ENABLED, $l_arr_Enabled),
+			)
+		);
+		// display template with replaced placeholders
+		echo $l_obj_Template->getContent();
+	}
+
 	/**
 	 * Displays all settings for the hyperlink arrow.
 	 *
diff --git a/class/init.php b/class/init.php
index c3fa01e..f42ee5f 100644
--- a/class/init.php
+++ b/class/init.php
@@ -105,12 +105,7 @@ class MCI_Footnotes {
 	 * @since 1.5.0
 	 */
 	public function registerPublicStyling() {
-		wp_register_style('mci_footnotes_css_general', plugins_url('../css/footnotes.css', __FILE__));
-		wp_register_style('mci_footnotes_css_tooltip', plugins_url('../css/tooltip.css', __FILE__));
-		wp_register_style('mci_footnotes_css_reference_container', plugins_url('../css/reference_container.css', __FILE__));
-
-		wp_enqueue_style('mci_footnotes_css_general');
-		wp_enqueue_style('mci_footnotes_css_tooltip');
-		wp_enqueue_style('mci_footnotes_css_reference_container');
+		wp_register_style('mci_footnotes_css_public', plugins_url('../css/public.css', __FILE__));
+		wp_enqueue_style('mci_footnotes_css_public');
 	}
 }
\ No newline at end of file
diff --git a/class/settings.php b/class/settings.php
index 0839422..5649a21 100644
--- a/class/settings.php
+++ b/class/settings.php
@@ -135,6 +135,15 @@ class MCI_Footnotes_Settings {
 	 */
 	const C_STR_FOOTNOTES_STYLING_AFTER = "footnote_inputfield_custom_styling_after";
 
+	/**
+	 * Settings Container Key for the mouse-over box to be enabled.
+	 *
+	 * @author Stefan Herndler
+	 * @since 1.5.2
+	 * @var string
+	 */
+	const C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ENABLED = "footnote_inputfield_custom_mouse_over_box_enabled";
+
 	/**
 	 * Settings Container Key for the Hyperlink arrow.
 	 *
@@ -204,6 +213,7 @@ class MCI_Footnotes_Settings {
 		"footnotes_storage_custom" => array(
 			self::C_STR_FOOTNOTES_STYLING_BEFORE => '',
 			self::C_STR_FOOTNOTES_STYLING_AFTER => ')',
+			self::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ENABLED => 'yes',
 			self::C_STR_HYPERLINK_ARROW => '&#8593;',
 			self::C_STR_HYPERLINK_ARROW_USER_DEFINED => '',
 			self::C_STR_CUSTOM_CSS => ''
@@ -301,7 +311,7 @@ class MCI_Footnotes_Settings {
 		// iterate through each setting in the container
 		foreach($l_arr_Options as $l_str_Key => $l_str_Value) {
 			// remove all whitespace at the beginning and end of a setting
-			$l_str_Value = trim($l_str_Value);
+			//$l_str_Value = trim($l_str_Value);
 			// write the sanitized value back to the setting container
 			$l_arr_Options[$l_str_Key] = $l_str_Value;
 		}
diff --git a/class/task.php b/class/task.php
index 02babd6..70af576 100644
--- a/class/task.php
+++ b/class/task.php
@@ -42,25 +42,23 @@ class MCI_Footnotes_Task {
 	 */
 	public function registerHooks() {
 		// append custom css to the header
-		add_action('wp_head', array($this, "Header"));
+		add_filter('wp_head', array($this, "Header"));
 
-		// append the reference container to the footer if enabled
-		if (MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_REFERENCE_CONTAINER_POSITION) == "footer") {
-			add_action('get_footer', array($this, "Footer"));
-		}
+		// append the reference container to the footer
+		add_filter('get_footer', array($this, "Footer"));
 
 		// append the love and share me slug to the footer
-		add_action('wp_footer', array($this, "Love"));
+		add_filter('wp_footer', array($this, "Love"));
 
 		// replace footnotes in the content of the page/post
-		add_filter('the_content', array($this, "Content"), 10);
+		add_filter('the_content', array($this, "Content"), PHP_INT_MAX);
 
 		// search for footnotes in the excerpt
-		add_filter('the_excerpt', array($this, "Excerpt"), 1);
-		add_filter('get_the_excerpt', array($this, "Excerpt"), 1);
+		add_filter('the_excerpt', array($this, "Excerpt"), PHP_INT_MAX);
+		add_filter('get_the_excerpt', array($this, "Excerpt"), PHP_INT_MAX);
 
 		// replace footnotes in the content of a widget
-		add_filter('widget_text', array($this, "WidgetText"), 99);
+		add_filter('widget_text', array($this, "WidgetText"), PHP_INT_MAX);
 	}
 
 	/**
@@ -75,6 +73,7 @@ class MCI_Footnotes_Task {
 		<?php
 		// reset stored footnotes when displaying the header
 		self::$a_arr_Footnotes = array();
+		//ob_start();
 	}
 
 	/**
@@ -84,7 +83,9 @@ class MCI_Footnotes_Task {
 	 * @since 1.5.0
 	 */
 	public function Footer() {
-		echo $this->ReferenceContainer();
+		if (MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_REFERENCE_CONTAINER_POSITION) == "footer") {
+			echo $this->ReferenceContainer();
+		}
 	}
 
 	/**
@@ -94,6 +95,10 @@ class MCI_Footnotes_Task {
 	 * @since 1.5.0
 	 */
 	public function Love() {
+		/*$l_str_Content = ob_get_contents();
+		$l_str_Content = $this->exec($l_str_Content, false);
+		ob_end_clean();
+		echo $l_str_Content;*/
 		// get setting for love and share this plugin
 		$l_str_LoveMeIndex = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_LOVE);
 		// check if the admin allows to add a link to the footer
@@ -159,7 +164,6 @@ class MCI_Footnotes_Task {
 		return $this->exec($p_str_Content, MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_REFERENCE_CONTAINER_POSITION) == "post_end" ? true : false);
 	}
 
-
 	/**
 	 * Replaces all footnotes that occur in the given content.
 	 *
@@ -170,7 +174,7 @@ class MCI_Footnotes_Task {
 	 * @param bool $p_bool_HideFootnotesText Hide footnotes found in the string.
 	 * @return string
 	 */
-	public function exec($p_str_Content, $p_bool_OutputReferences = true, $p_bool_HideFootnotesText = false) {
+	public function exec($p_str_Content, $p_bool_OutputReferences = false, $p_bool_HideFootnotesText = false) {
 		// replace all footnotes in the content, settings are converted to html characters
 		$p_str_Content = $this->search($p_str_Content, true, $p_bool_HideFootnotesText);
 		// replace all footnotes in the content, settings are NOT converted to html characters
@@ -225,8 +229,10 @@ class MCI_Footnotes_Task {
 		if (!$p_bool_HideFootnotesText) {
 			// load template file
 			$l_obj_Template = new MCI_Footnotes_Template(MCI_Footnotes_Template::C_STR_PUBLIC, "footnote");
+			$l_obj_TemplateTooltip = new MCI_Footnotes_Template(MCI_Footnotes_Template::C_STR_PUBLIC, "tooltip");
 		} else {
 			$l_obj_Template = null;
+			$l_obj_TemplateTooltip = null;
 		}
 
 		// search footnotes short codes in the content
@@ -251,11 +257,12 @@ class MCI_Footnotes_Task {
 			$l_str_FootnoteReplaceText = "";
 			// display the footnote as mouse-over box
 			if (!$p_bool_HideFootnotesText) {
+				$l_str_Index = MCI_Footnotes_Convert::Index($l_int_FootnoteIndex, MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE));
 				// fill the footnotes template
 				$l_obj_Template->replace(
 					array(
-						"index" => MCI_Footnotes_Convert::Index($l_int_FootnoteIndex, MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE)),
-						"text" => $l_str_FootnoteText,
+						"index" => $l_str_Index,
+						"text" => MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ENABLED)) ? $l_str_FootnoteText : "",
 						"before" => MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_STYLING_BEFORE),
 						"after" => MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_STYLING_AFTER)
 					)
@@ -263,6 +270,11 @@ class MCI_Footnotes_Task {
 				$l_str_FootnoteReplaceText = $l_obj_Template->getContent();
 				// reset the template
 				$l_obj_Template->reload();
+				if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ENABLED))) {
+					$l_obj_TemplateTooltip->replace(array("index" => $l_str_Index));
+					$l_str_FootnoteReplaceText .= $l_obj_TemplateTooltip->getContent();
+					$l_obj_TemplateTooltip->reload();
+				}
 			}
 			// replace the footnote with the template
 			$p_str_Content = substr_replace($p_str_Content, $l_str_FootnoteReplaceText, $l_int_PosStart, $l_int_Length + strlen($l_str_EndingTag));
diff --git a/class/template.php b/class/template.php
index 993cb88..4efc952 100644
--- a/class/template.php
+++ b/class/template.php
@@ -60,14 +60,15 @@ class MCI_Footnotes_Template {
 	 * @since 1.5.0
 	 * @param string $p_str_FileType Template file type (take a look on the Class constants).
 	 * @param string $p_str_FileName Template file name inside the Template directory without the file extension.
+	 * @param string $p_str_Extension Optional Template file extension (default: html)
 	 */
-	public function __construct($p_str_FileType, $p_str_FileName) {
+	public function __construct($p_str_FileType, $p_str_FileName, $p_str_Extension = "html") {
 		// no template file type and/or file name set
 		if (empty($p_str_FileType) || empty($p_str_FileName)) {
 			return;
 		}
 		// get absolute path to the specified template file
-		$l_str_TemplateFile = dirname(__FILE__) . "/../templates/" . $p_str_FileType . "/" . $p_str_FileName . ".html";
+		$l_str_TemplateFile = dirname(__FILE__) . "/../templates/" . $p_str_FileType . "/" . $p_str_FileName . "." . $p_str_Extension;
 		// Template file does not exist
 		if (!file_exists($l_str_TemplateFile)) {
 			return;
diff --git a/class/wysiwyg.php b/class/wysiwyg.php
index c034185..d8b558b 100644
--- a/class/wysiwyg.php
+++ b/class/wysiwyg.php
@@ -77,7 +77,7 @@ class MCI_Footnotes_WYSIWYG {
 			$l_str_StartingTag = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_START_USER_DEFINED);
 			$l_str_EndingTag = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_END_USER_DEFINED);
 		}
-		echo json_encode(array("start" => $l_str_StartingTag, "end" => $l_str_EndingTag));
+		echo json_encode(array("start" => htmlspecialchars($l_str_StartingTag), "end" => htmlspecialchars($l_str_EndingTag)));
 		exit;
 	}
 }
\ No newline at end of file
diff --git a/css/footnotes.css b/css/footnotes.css
deleted file mode 100755
index dc1e9da..0000000
--- a/css/footnotes.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Created by Stefan Herndler.
- * User: Stefan
- * Date: 15.05.14
- * Time: 16:21
- * Version: 1.0.7
- * Since: 1.0
- */
-
-/*
- * styling for the 'footnotes' tag
- * @since 1.0.7
-*/
-.footnote_tag_styling, .footnote_tag_styling:hover {
-    text-decoration: none;
-    font-weight: normal;
-}
-
-.footnote_tag_styling_1 {
-    color: #2bb975;
-}
-
-.footnote_tag_styling_2 {
-    color: #545f5a;
-}
\ No newline at end of file
diff --git a/css/reference_container.css b/css/public.css
old mode 100644
new mode 100755
similarity index 62%
rename from css/reference_container.css
rename to css/public.css
index 4323cc6..6996ad5
--- a/css/reference_container.css
+++ b/css/public.css
@@ -1,11 +1,49 @@
 /**
  * Created by Stefan Herndler.
  * User: Stefan
- * Date: 30.07.14 11:25
- * Version: 1.0
- * Since: 1.3
+ * Date: 15.05.14
+ * Time: 16:21
+ * Version: 1.0.7
+ * Since: 1.0
  */
 
+/* styling for the 'footnotes' tag */
+.footnote_tag_styling, .footnote_tag_styling:hover {
+    text-decoration: none;
+    font-weight: normal;
+}
+
+.footnote_tag_styling_1 {
+    color: #2bb975;
+}
+
+.footnote_tag_styling_2 {
+    color: #545f5a;
+}
+
+/* tooltip */
+.footnote_plugin_tooltip_text {
+	text-decoration: none !important;
+}
+
+.footnote_plugin_tooltip_text > sup {
+	vertical-align: top !important;
+	position: relative !important;
+	top: -0.1em !important;
+}
+
+/* tooltip styling */
+.footnote_tooltip {
+	display: none;
+	background-color: #fff7a7;
+	border: 1px solid #cccc99;
+	border-radius: 3px;
+	padding: 12px;
+	font-size: 13px;
+	-moz-box-shadow: 2px 2px 11px #666;
+	-webkit-box-shadow: 2px 2px 11px #666;
+}
+
 /* container before the footnote appears at the bottom to get a space between footnote and content */
 .footnote_container_prepare {
 	display: block !important;
diff --git a/css/tooltip.css b/css/tooltip.css
deleted file mode 100644
index 73a983f..0000000
--- a/css/tooltip.css
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Created by Stefan Herndler.
- * User: Stefan
- * Date: 30.07.14 11:26
- * Version: 1.0
- * Since: 1.3
- */
-
-/* tooltip */
-.footnote_plugin_tooltip_text {
-	text-decoration: none !important;
-}
-
-.footnote_plugin_tooltip_text > sup {
-	vertical-align: top !important;
-	position: relative !important;
-	top: -0.1em !important;
-}
-
-/* tooltip styling */
-.footnote_tooltip {
-	display: none;
-	background-color: #fff7a7;
-	border: 1px solid #cccc99;
-	border-radius: 3px;
-	padding: 12px;
-	font-size: 13px;
-	-moz-box-shadow: 2px 2px 11px #666;
-	-webkit-box-shadow: 2px 2px 11px #666;
-}
\ No newline at end of file
diff --git a/features.txt b/features.txt
index f9133ef..8d69d66 100644
--- a/features.txt
+++ b/features.txt
@@ -8,14 +8,9 @@
 - Add last updated timestamp
 
 
-== Diagnostics ==
-- Add current WordPress Theme (Name, Version, Author, Url)
-
-
 == Footnotes Features ==
 - Add public css file to the "How to" tab
 - Add setting to customize the mouse-over box
-- Add setting to disable the mouse-over box
 - Display the mouse-over box to the left if near the right margin
 - Abbreviate the mouse-over text if more than XXX characters (ending with "...")
 - Performance of the task so PHP won't throw an error when there are more than 120? Footnotes
diff --git a/index.php b/index.php
index ab677b4..de864a1 100755
--- a/index.php
+++ b/index.php
@@ -4,7 +4,7 @@
 	Plugin URI: http://wordpress.org/plugins/footnotes/
 	Description: time to bring footnotes to your website! footnotes are known from offline publishing and everybody takes them for granted when reading a magazine.
 	Author: ManFisher Medien ManuFaktur
-	Version: 1.5.1
+	Version: 1.5.2
 	Author URI: http://manfisher.net/plugins/footnotes/
 	Text Domain: footnotes
 	Domain Path: /languages
diff --git a/languages/footnotes-de.mo b/languages/footnotes-de.mo
index d69ac12..d15868b 100755
Binary files a/languages/footnotes-de.mo and b/languages/footnotes-de.mo differ
diff --git a/languages/footnotes-de.po b/languages/footnotes-de.po
index 09718a8..a025b98 100755
--- a/languages/footnotes-de.po
+++ b/languages/footnotes-de.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: footnotes\n"
-"POT-Creation-Date: 2014-09-28 21:42+0100\n"
-"PO-Revision-Date: 2014-09-28 21:42+0100\n"
+"POT-Creation-Date: 2014-10-01 22:55+0100\n"
+"PO-Revision-Date: 2014-10-01 22:56+0100\n"
 "Last-Translator: Mark Cheret <mark@cheret.de>\n"
 "Language-Team: SHE <s.herndler@methis.at>\n"
 "Language: de\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: class/dashboard/init.php:145
+#: class/dashboard/init.php:151
 msgid "Take a look on other Plugins we have developed."
 msgstr "Sehen Sie sich unsere weiteren WordPress Plugins an"
 
-#: class/dashboard/layout.php:237
+#: class/dashboard/layout.php:239
 msgid "Settings saved"
 msgstr "Einstellungen gespeichert"
 
@@ -35,34 +35,38 @@ msgstr "Diagnose"
 msgid "Displays information about the web server, PHP and WordPress"
 msgstr "Ausgabe von Informationen bezgl. des Webservers, PHP und WordPress"
 
-#: class/dashboard/subpage-diagnostics.php:106
+#: class/dashboard/subpage-diagnostics.php:110
 msgid "Server name"
 msgstr "Servername"
 
-#: class/dashboard/subpage-diagnostics.php:109
+#: class/dashboard/subpage-diagnostics.php:113
 msgid "PHP version"
 msgstr "PHP Version"
 
-#: class/dashboard/subpage-diagnostics.php:112
+#: class/dashboard/subpage-diagnostics.php:116
 msgid "Max execution time"
 msgstr "max. Ausführungsdauer"
 
-#: class/dashboard/subpage-diagnostics.php:113
+#: class/dashboard/subpage-diagnostics.php:117
 msgid "seconds"
 msgstr "Sekunden"
 
-#: class/dashboard/subpage-diagnostics.php:115
+#: class/dashboard/subpage-diagnostics.php:119
 msgid "Memory limit"
 msgstr "Speicherlimitierung"
 
-#: class/dashboard/subpage-diagnostics.php:118
+#: class/dashboard/subpage-diagnostics.php:122
 msgid "PHP extensions"
 msgstr "PHP Erweiterungen"
 
-#: class/dashboard/subpage-diagnostics.php:121
+#: class/dashboard/subpage-diagnostics.php:125
 msgid "WordPress version"
 msgstr "WordPress Version"
 
+#: class/dashboard/subpage-diagnostics.php:128
+msgid "Active Theme"
+msgstr "Aktuelles Theme"
+
 #: class/dashboard/subpage-main.php:60 class/hooks.php:82
 msgid "Settings"
 msgstr "Einstellungen"
@@ -93,123 +97,129 @@ msgid "Superscript layout"
 msgstr "Layout des Fußnoten Index"
 
 #: class/dashboard/subpage-main.php:81
+msgid "Mouse-over box"
+msgstr "Tooltip Popup Fenster"
+
+#: class/dashboard/subpage-main.php:82
 msgid "Hyperlink symbol in the Reference container"
 msgstr "Einzelnachweis - Symbol für den Link zur Fußnote im Text"
 
-#: class/dashboard/subpage-main.php:82
+#: class/dashboard/subpage-main.php:83
 msgid "Add custom CSS to the public page"
 msgstr "Benutzerdefinierten CSS Code zu den veröffentlichten Seiten hinzufügen"
 
-#: class/dashboard/subpage-main.php:84
+#: class/dashboard/subpage-main.php:85
 msgid "Brief introduction in how to use the plugin"
 msgstr "Kurze Anleitung für die Verwendung des Plugins."
 
-#: class/dashboard/subpage-main.php:85
+#: class/dashboard/subpage-main.php:86
 msgid "Help us to improve our Plugin"
 msgstr "Helfen Sie bei der weiteren Entwicklung des Plugins."
 
-#: class/dashboard/subpage-main.php:98
+#: class/dashboard/subpage-main.php:99
 msgid "in the footer"
 msgstr "am Ende der Seite"
 
-#: class/dashboard/subpage-main.php:99
+#: class/dashboard/subpage-main.php:100
 msgid "at the end of the post"
 msgstr "nach einem Beitrag"
 
-#: class/dashboard/subpage-main.php:100
+#: class/dashboard/subpage-main.php:101
 msgid "in the widget area"
 msgstr "im Widget"
 
-#: class/dashboard/subpage-main.php:108
+#: class/dashboard/subpage-main.php:109
 msgid "References label"
 msgstr "Überschrift \"Einzelnachweis\":"
 
-#: class/dashboard/subpage-main.php:111
+#: class/dashboard/subpage-main.php:112
 msgid "Collapse references by default"
 msgstr "Zeige Einzelnachweise zunächst zusammengeklappt:"
 
-#: class/dashboard/subpage-main.php:114
+#: class/dashboard/subpage-main.php:115
 msgid "Where shall the reference container appear"
 msgstr "Positionierung der Einzelnachweise:"
 
-#: class/dashboard/subpage-main.php:133 class/dashboard/subpage-main.php:233
+#: class/dashboard/subpage-main.php:134 class/dashboard/subpage-main.php:234
+#: class/dashboard/subpage-main.php:283
 msgid "Yes"
 msgstr "Ja"
 
-#: class/dashboard/subpage-main.php:134 class/dashboard/subpage-main.php:234
+#: class/dashboard/subpage-main.php:135 class/dashboard/subpage-main.php:235
+#: class/dashboard/subpage-main.php:284
 msgid "No"
 msgstr "Nein"
 
-#: class/dashboard/subpage-main.php:141 class/dashboard/subpage-main.php:148
+#: class/dashboard/subpage-main.php:142 class/dashboard/subpage-main.php:149
 msgid "user defined"
 msgstr "benutzerdefiniert"
 
-#: class/dashboard/subpage-main.php:152
+#: class/dashboard/subpage-main.php:153
 msgid "Arabic Numbers - Plain"
 msgstr "arabische Ziffern"
 
-#: class/dashboard/subpage-main.php:153
+#: class/dashboard/subpage-main.php:154
 msgid "Arabic Numbers - Leading 0"
 msgstr "arabisch Ziffern - führende Null"
 
-#: class/dashboard/subpage-main.php:154
+#: class/dashboard/subpage-main.php:155
 msgid "Latin Character - lower case"
 msgstr "alphabetisch - Kleinschreibung"
 
-#: class/dashboard/subpage-main.php:155
+#: class/dashboard/subpage-main.php:156
 msgid "Latin Character - upper case"
 msgstr "alphabetisch - Großschreibung"
 
-#: class/dashboard/subpage-main.php:156
+#: class/dashboard/subpage-main.php:157
 msgid "Roman Numerals"
 msgstr "Römische Ziffern"
 
-#: class/dashboard/subpage-main.php:164
+#: class/dashboard/subpage-main.php:165
 msgid "Combine identical footnotes"
 msgstr "Kombiniere identische Fußnoten:"
 
-#: class/dashboard/subpage-main.php:167
+#: class/dashboard/subpage-main.php:168
 msgid "Footnote tag starts with"
 msgstr "Start-Shortcode:"
 
-#: class/dashboard/subpage-main.php:170
+#: class/dashboard/subpage-main.php:171
 msgid "and ends with"
 msgstr "endet mit:"
 
-#: class/dashboard/subpage-main.php:179
+#: class/dashboard/subpage-main.php:180
 msgid "Counter style"
 msgstr "Fußnoten Zähler:"
 
-#: class/dashboard/subpage-main.php:201 class/task.php:111
+#: class/dashboard/subpage-main.php:202 class/task.php:116
 #, php-format
 msgid "I %s %s"
 msgstr "Ich %s %s"
 
-#: class/dashboard/subpage-main.php:202 class/task.php:114
+#: class/dashboard/subpage-main.php:203 class/task.php:119
 #, php-format
 msgid "this site uses the awesome %s Plugin"
 msgstr "Diese Seite verwendet das Plugin %s"
 
-#: class/dashboard/subpage-main.php:203 class/task.php:118
+#: class/dashboard/subpage-main.php:204 class/task.php:123
 #, php-format
 msgid "extra smooth %s"
 msgstr "besonders feine %s"
 
-#: class/dashboard/subpage-main.php:204
+#: class/dashboard/subpage-main.php:205
 msgid "random text"
 msgstr "zufälliger Text"
 
-#: class/dashboard/subpage-main.php:205
+#: class/dashboard/subpage-main.php:206
 #, php-format
 msgid "Don't display a %s %s text in my footer."
 msgstr "Verstecke %s %s am Ende meiner Seite."
 
-#: class/dashboard/subpage-main.php:213
+#: class/dashboard/subpage-main.php:214
 #, php-format
 msgid "Tell the world you're using %s"
 msgstr "Teilen Sie der Welt mit, dass Sie %s verwenden:"
 
-#: class/dashboard/subpage-main.php:216
+#: class/dashboard/subpage-main.php:217
 #, php-format
 msgid ""
 "Don't tell the world you're using %s on specific pages by adding the "
@@ -218,78 +228,82 @@ msgstr ""
 "Platzhalter um der Welt an einzelnen Seiten nicht mitzuteilen, dass Sie %s "
 "verwenden:"
 
-#: class/dashboard/subpage-main.php:242
+#: class/dashboard/subpage-main.php:243
 msgid "Allow footnotes on Summarized Posts"
 msgstr "Erlaube Fußnoten in Zusammenfassungen:"
 
-#: class/dashboard/subpage-main.php:262
+#: class/dashboard/subpage-main.php:263
 msgid "Before Footnotes index"
 msgstr "Symbol nach Fußnoten:"
 
-#: class/dashboard/subpage-main.php:265
+#: class/dashboard/subpage-main.php:266
 msgid "After Footnotes index"
 msgstr "Symbole nach Fußnoten:"
 
-#: class/dashboard/subpage-main.php:285
+#: class/dashboard/subpage-main.php:291
+msgid "Enable the mouse-over box"
+msgstr "Aktiviere das Tooltip Popup Fenster"
+
+#: class/dashboard/subpage-main.php:311
 msgid "Hyperlink symbol"
 msgstr "Symbol für den Hyperlink:"
 
-#: class/dashboard/subpage-main.php:288
+#: class/dashboard/subpage-main.php:314
 msgid "or enter a user defined symbol"
 msgstr "oder definieren Sie ein eigenes Symbol:"
 
-#: class/dashboard/subpage-main.php:290
+#: class/dashboard/subpage-main.php:316
 msgid "if set it overrides the hyperlink symbol above"
 msgstr "wenn gesetzt, wird das oben definierte Symbol überschrieben"
 
-#: class/dashboard/subpage-main.php:309
+#: class/dashboard/subpage-main.php:335
 msgid "Add custom CSS"
 msgstr "Benutzerdefinierter CSS Code:"
 
-#: class/dashboard/subpage-main.php:312
+#: class/dashboard/subpage-main.php:338
 msgid ""
 "Available CSS classes to customize the footnotes and the reference container"
 msgstr ""
 "Verfügbare CSS Klassen um die Fußnoten und den Einzelnachweis zu "
 "personalisieren:"
 
-#: class/dashboard/subpage-main.php:315
+#: class/dashboard/subpage-main.php:341
 msgid "inline footnotes"
 msgstr "Fußnoten Index im veröffneltichten Text"
 
-#: class/dashboard/subpage-main.php:318
+#: class/dashboard/subpage-main.php:344
 msgid "inline footnotes, mouse over highlight box"
 msgstr "Popup der Fußnote im veröffentlichten Text"
 
-#: class/dashboard/subpage-main.php:321
+#: class/dashboard/subpage-main.php:347
 msgid "reference container footnotes index"
 msgstr "Einzelnachweis - Fußnote Index"
 
-#: class/dashboard/subpage-main.php:324
+#: class/dashboard/subpage-main.php:350
 msgid "reference container footnotes linked arrow"
 msgstr "Einzelnachweiß - Symbol für den Link"
 
-#: class/dashboard/subpage-main.php:327
+#: class/dashboard/subpage-main.php:353
 msgid "reference container footnotes text"
 msgstr "Einzelnachweis - Fußnote"
 
-#: class/dashboard/subpage-main.php:351
+#: class/dashboard/subpage-main.php:377
 msgid "example string"
 msgstr "Beispieltext"
 
-#: class/dashboard/subpage-main.php:358
+#: class/dashboard/subpage-main.php:384
 msgid "Start your footnote with the following short code:"
 msgstr "Starten Sie eine Fußnote mit dem folgenden Shortcode:"
 
-#: class/dashboard/subpage-main.php:361
+#: class/dashboard/subpage-main.php:387
 msgid "...and end your footnote with this short code:"
 msgstr "...und beenden Sie diesen mit:"
 
-#: class/dashboard/subpage-main.php:365
+#: class/dashboard/subpage-main.php:391
 msgid "will be displayed as:"
 msgstr "wird dargestellt als:"
 
-#: class/dashboard/subpage-main.php:368
+#: class/dashboard/subpage-main.php:394
 #, php-format
 msgid ""
 "For further information please check out our %ssupport forum%s on WordPress."
@@ -298,7 +312,7 @@ msgstr ""
 "Für mehr Informationen besuchen Sie unser %sSupport Forum%s auf WordPress."
 "org."
 
-#: class/dashboard/subpage-main.php:387
+#: class/dashboard/subpage-main.php:413
 msgid "Donate now"
 msgstr "Jetzt spenden"
 
diff --git a/languages/footnotes-en.mo b/languages/footnotes-en.mo
index 8f2ee6e..bab97c5 100755
Binary files a/languages/footnotes-en.mo and b/languages/footnotes-en.mo differ
diff --git a/languages/footnotes-en.po b/languages/footnotes-en.po
index a522ee7..cc69038 100755
--- a/languages/footnotes-en.po
+++ b/languages/footnotes-en.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: footnotes\n"
-"POT-Creation-Date: 2014-09-28 21:35+0100\n"
-"PO-Revision-Date: 2014-09-28 21:36+0100\n"
+"POT-Creation-Date: 2014-10-01 22:55+0100\n"
+"PO-Revision-Date: 2014-10-01 22:55+0100\n"
 "Last-Translator: Mark Cheret <mark@cheret.de>\n"
 "Language-Team: SHE <s.herndler@methis.at>\n"
 "Language: en\n"
@@ -18,11 +18,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: class/dashboard/init.php:145
+#: class/dashboard/init.php:151
 msgid "Take a look on other Plugins we have developed."
 msgstr "Take a look at other Plugins we have developed."
 
-#: class/dashboard/layout.php:237
+#: class/dashboard/layout.php:239
 msgid "Settings saved"
 msgstr "Settings saved"
 
@@ -35,34 +35,38 @@ msgstr "Diagnostics"
 msgid "Displays information about the web server, PHP and WordPress"
 msgstr "Displays information about the web server, PHP and WordPress"
 
-#: class/dashboard/subpage-diagnostics.php:106
+#: class/dashboard/subpage-diagnostics.php:110
 msgid "Server name"
 msgstr "Server name"
 
-#: class/dashboard/subpage-diagnostics.php:109
+#: class/dashboard/subpage-diagnostics.php:113
 msgid "PHP version"
 msgstr "PHP version"
 
-#: class/dashboard/subpage-diagnostics.php:112
+#: class/dashboard/subpage-diagnostics.php:116
 msgid "Max execution time"
 msgstr "Max execution time"
 
-#: class/dashboard/subpage-diagnostics.php:113
+#: class/dashboard/subpage-diagnostics.php:117
 msgid "seconds"
 msgstr "seconds"
 
-#: class/dashboard/subpage-diagnostics.php:115
+#: class/dashboard/subpage-diagnostics.php:119
 msgid "Memory limit"
 msgstr "Memory limit"
 
-#: class/dashboard/subpage-diagnostics.php:118
+#: class/dashboard/subpage-diagnostics.php:122
 msgid "PHP extensions"
 msgstr "PHP extensions"
 
-#: class/dashboard/subpage-diagnostics.php:121
+#: class/dashboard/subpage-diagnostics.php:125
 msgid "WordPress version"
 msgstr "WordPress version"
 
+#: class/dashboard/subpage-diagnostics.php:128
+msgid "Active Theme"
+msgstr "Active Theme"
+
 #: class/dashboard/subpage-main.php:60 class/hooks.php:82
 msgid "Settings"
 msgstr "Settings"
@@ -93,123 +97,129 @@ msgid "Superscript layout"
 msgstr "Superscript layout"
 
 #: class/dashboard/subpage-main.php:81
+msgid "Mouse-over box"
+msgstr "Mouse-over box"
+
+#: class/dashboard/subpage-main.php:82
 msgid "Hyperlink symbol in the Reference container"
 msgstr "Hyperlink symbol in the Reference container"
 
-#: class/dashboard/subpage-main.php:82
+#: class/dashboard/subpage-main.php:83
 msgid "Add custom CSS to the public page"
 msgstr "Add custom CSS to the public page"
 
-#: class/dashboard/subpage-main.php:84
+#: class/dashboard/subpage-main.php:85
 msgid "Brief introduction in how to use the plugin"
 msgstr "Brief introduction in how to use the plugin"
 
-#: class/dashboard/subpage-main.php:85
+#: class/dashboard/subpage-main.php:86
 msgid "Help us to improve our Plugin"
 msgstr "Help us to improve our Plugin"
 
-#: class/dashboard/subpage-main.php:98
+#: class/dashboard/subpage-main.php:99
 msgid "in the footer"
 msgstr "in the footer"
 
-#: class/dashboard/subpage-main.php:99
+#: class/dashboard/subpage-main.php:100
 msgid "at the end of the post"
 msgstr "at the end of the post"
 
-#: class/dashboard/subpage-main.php:100
+#: class/dashboard/subpage-main.php:101
 msgid "in the widget area"
 msgstr "in the widget area"
 
-#: class/dashboard/subpage-main.php:108
+#: class/dashboard/subpage-main.php:109
 msgid "References label"
 msgstr "References label"
 
-#: class/dashboard/subpage-main.php:111
+#: class/dashboard/subpage-main.php:112
 msgid "Collapse references by default"
 msgstr "Collapse references by default"
 
-#: class/dashboard/subpage-main.php:114
+#: class/dashboard/subpage-main.php:115
 msgid "Where shall the reference container appear"
 msgstr "Where shall the reference container appear"
 
-#: class/dashboard/subpage-main.php:133 class/dashboard/subpage-main.php:233
+#: class/dashboard/subpage-main.php:134 class/dashboard/subpage-main.php:234
+#: class/dashboard/subpage-main.php:283
 msgid "Yes"
 msgstr "Yes"
 
-#: class/dashboard/subpage-main.php:134 class/dashboard/subpage-main.php:234
+#: class/dashboard/subpage-main.php:135 class/dashboard/subpage-main.php:235
+#: class/dashboard/subpage-main.php:284
 msgid "No"
 msgstr "No"
 
-#: class/dashboard/subpage-main.php:141 class/dashboard/subpage-main.php:148
+#: class/dashboard/subpage-main.php:142 class/dashboard/subpage-main.php:149
 msgid "user defined"
 msgstr "user defined"
 
-#: class/dashboard/subpage-main.php:152
+#: class/dashboard/subpage-main.php:153
 msgid "Arabic Numbers - Plain"
 msgstr "Arabic Numbers - Plain"
 
-#: class/dashboard/subpage-main.php:153
+#: class/dashboard/subpage-main.php:154
 msgid "Arabic Numbers - Leading 0"
 msgstr "Arabic Numbers - Leading 0"
 
-#: class/dashboard/subpage-main.php:154
+#: class/dashboard/subpage-main.php:155
 msgid "Latin Character - lower case"
 msgstr "Latin Character - lower case"
 
-#: class/dashboard/subpage-main.php:155
+#: class/dashboard/subpage-main.php:156
 msgid "Latin Character - upper case"
 msgstr "Latin Character - upper case"
 
-#: class/dashboard/subpage-main.php:156
+#: class/dashboard/subpage-main.php:157
 msgid "Roman Numerals"
 msgstr "Roman Numerals"
 
-#: class/dashboard/subpage-main.php:164
+#: class/dashboard/subpage-main.php:165
 msgid "Combine identical footnotes"
 msgstr "Combine identical footnotes"
 
-#: class/dashboard/subpage-main.php:167
+#: class/dashboard/subpage-main.php:168
 msgid "Footnote tag starts with"
 msgstr "Footnote tag starts with"
 
-#: class/dashboard/subpage-main.php:170
+#: class/dashboard/subpage-main.php:171
 msgid "and ends with"
 msgstr "and ends with"
 
-#: class/dashboard/subpage-main.php:179
+#: class/dashboard/subpage-main.php:180
 msgid "Counter style"
 msgstr "Counter style"
 
-#: class/dashboard/subpage-main.php:201 class/task.php:111
+#: class/dashboard/subpage-main.php:202 class/task.php:116
 #, php-format
 msgid "I %s %s"
 msgstr "I %s %s"
 
-#: class/dashboard/subpage-main.php:202 class/task.php:114
+#: class/dashboard/subpage-main.php:203 class/task.php:119
 #, php-format
 msgid "this site uses the awesome %s Plugin"
 msgstr "this site uses the awesome %s Plugin"
 
-#: class/dashboard/subpage-main.php:203 class/task.php:118
+#: class/dashboard/subpage-main.php:204 class/task.php:123
 #, php-format
 msgid "extra smooth %s"
 msgstr "extra smooth %s"
 
-#: class/dashboard/subpage-main.php:204
+#: class/dashboard/subpage-main.php:205
 msgid "random text"
 msgstr "random text"
 
-#: class/dashboard/subpage-main.php:205
+#: class/dashboard/subpage-main.php:206
 #, php-format
 msgid "Don't display a %s %s text in my footer."
 msgstr "Don't display a %s %s text in my footer."
 
-#: class/dashboard/subpage-main.php:213
+#: class/dashboard/subpage-main.php:214
 #, php-format
 msgid "Tell the world you're using %s"
 msgstr "Tell the world you're using %s"
 
-#: class/dashboard/subpage-main.php:216
+#: class/dashboard/subpage-main.php:217
 #, php-format
 msgid ""
 "Don't tell the world you're using %s on specific pages by adding the "
@@ -218,77 +228,81 @@ msgstr ""
 "Don't tell the world you're using %s on specific pages by adding the "
 "following short code:"
 
-#: class/dashboard/subpage-main.php:242
+#: class/dashboard/subpage-main.php:243
 msgid "Allow footnotes on Summarized Posts"
 msgstr "Allow footnotes on Summarized Posts"
 
-#: class/dashboard/subpage-main.php:262
+#: class/dashboard/subpage-main.php:263
 msgid "Before Footnotes index"
 msgstr "Before Footnotes index"
 
-#: class/dashboard/subpage-main.php:265
+#: class/dashboard/subpage-main.php:266
 msgid "After Footnotes index"
 msgstr "After Footnotes index"
 
-#: class/dashboard/subpage-main.php:285
+#: class/dashboard/subpage-main.php:291
+msgid "Enable the mouse-over box"
+msgstr "Enable the mouse-over box"
+
+#: class/dashboard/subpage-main.php:311
 msgid "Hyperlink symbol"
 msgstr "Hyperlink symbol"
 
-#: class/dashboard/subpage-main.php:288
+#: class/dashboard/subpage-main.php:314
 msgid "or enter a user defined symbol"
 msgstr "or enter a user defined symbol"
 
-#: class/dashboard/subpage-main.php:290
+#: class/dashboard/subpage-main.php:316
 msgid "if set it overrides the hyperlink symbol above"
 msgstr "if set it overrides the hyperlink symbol above"
 
-#: class/dashboard/subpage-main.php:309
+#: class/dashboard/subpage-main.php:335
 msgid "Add custom CSS"
 msgstr "Add custom CSS"
 
-#: class/dashboard/subpage-main.php:312
+#: class/dashboard/subpage-main.php:338
 msgid ""
 "Available CSS classes to customize the footnotes and the reference container"
 msgstr ""
 "Available CSS classes to customize the footnotes and the reference container"
 
-#: class/dashboard/subpage-main.php:315
+#: class/dashboard/subpage-main.php:341
 msgid "inline footnotes"
 msgstr "inline footnotes"
 
-#: class/dashboard/subpage-main.php:318
+#: class/dashboard/subpage-main.php:344
 msgid "inline footnotes, mouse over highlight box"
 msgstr "inline footnotes, mouse over highlight box"
 
-#: class/dashboard/subpage-main.php:321
+#: class/dashboard/subpage-main.php:347
 msgid "reference container footnotes index"
 msgstr "reference container footnotes index"
 
-#: class/dashboard/subpage-main.php:324
+#: class/dashboard/subpage-main.php:350
 msgid "reference container footnotes linked arrow"
 msgstr "reference container footnotes linked arrow"
 
-#: class/dashboard/subpage-main.php:327
+#: class/dashboard/subpage-main.php:353
 msgid "reference container footnotes text"
 msgstr "reference container footnotes text"
 
-#: class/dashboard/subpage-main.php:351
+#: class/dashboard/subpage-main.php:377
 msgid "example string"
 msgstr "example string"
 
-#: class/dashboard/subpage-main.php:358
+#: class/dashboard/subpage-main.php:384
 msgid "Start your footnote with the following short code:"
 msgstr "Start your footnote with the following short code:"
 
-#: class/dashboard/subpage-main.php:361
+#: class/dashboard/subpage-main.php:387
 msgid "...and end your footnote with this short code:"
 msgstr "...and end your footnote with this short code:"
 
-#: class/dashboard/subpage-main.php:365
+#: class/dashboard/subpage-main.php:391
 msgid "will be displayed as:"
 msgstr "will be displayed as:"
 
-#: class/dashboard/subpage-main.php:368
+#: class/dashboard/subpage-main.php:394
 #, php-format
 msgid ""
 "For further information please check out our %ssupport forum%s on WordPress."
@@ -297,7 +311,7 @@ msgstr ""
 "For further information please check out our %ssupport forum%s on WordPress."
 "org."
 
-#: class/dashboard/subpage-main.php:387
+#: class/dashboard/subpage-main.php:413
 msgid "Donate now"
 msgstr "Donate now"
 
diff --git a/readme.txt b/readme.txt
index 33052e2..8087112 100755
--- a/readme.txt
+++ b/readme.txt
@@ -6,7 +6,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tested up to: 4.0
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
-Stable Tag: 1.5.1
+Stable Tag: 1.5.2
 
 == Description ==
 
@@ -72,8 +72,18 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest**
 
 == Changelog ==
 
-= 1.5.1 =
+= 1.5.2 =
+- Add: Setting to enable/disable the mouse-over box
+- Add: Current WordPress Theme to the Diagnostics sub page
+- Add: ManFisher note in the "other Plugins" sub page
+- Update: Removed unnecessary hidden inputs from the Settings page
+- Update: Merged public CSS files to reduce the output and improve the performance
+- Update: Translations (EN and DE)
+- Bugfix: Removed the 'trim' function to allow whitespaces at the beginning and end of each setting
+- Bugfix: Convert the footnotes short code to HTML special chars when adding them into the page/post editor (visual and text)
+- Bugfix: Detailed error messages if other Plugins can't be loaded. Also added empty strings as default values to avoid 'undefined'
 
+= 1.5.1 =
 - Bugfix: Broken Settings link in the Plugin listing
 - Bugfix: Translation overhaul for German
 
diff --git a/templates/dashboard/customize-mouse-over-box.html b/templates/dashboard/customize-mouse-over-box.html
new file mode 100644
index 0000000..4c1c6d5
--- /dev/null
+++ b/templates/dashboard/customize-mouse-over-box.html
@@ -0,0 +1,8 @@
+<table class="widefat fixed">
+	<tbody>
+	<tr>
+		<td>[[label-enable]]</td>
+		<td>[[enable]]</td>
+	</tr>
+	</tbody>
+</table>
\ No newline at end of file
diff --git a/templates/dashboard/diagnostics.html b/templates/dashboard/diagnostics.html
index 982c2e5..345c5b2 100644
--- a/templates/dashboard/diagnostics.html
+++ b/templates/dashboard/diagnostics.html
@@ -24,6 +24,10 @@
 		<td>[[label-wordpress]]</td>
 		<td>[[wordpress]]</td>
 	</tr>
+	<tr>
+		<td>[[label-theme]]</td>
+		<td>[[theme]]</td>
+	</tr>
 	[[plugins]]
 	</tbody>
 </table>
\ No newline at end of file
diff --git a/templates/dashboard/manfisher.html b/templates/dashboard/manfisher.html
new file mode 100644
index 0000000..5628eeb
--- /dev/null
+++ b/templates/dashboard/manfisher.html
@@ -0,0 +1,15 @@
+<div style="-webkit-print-color-adjust: exact; padding: 0; color: rgb(115, 115, 115); font-family: 'Helvetica Neue', Helvetica, 'Hiragino Sans GB', Arial, sans-serif;">
+	<h1 style="margin: 0 0 18px; color: rgb(64, 64, 64); line-height: 36px; font-size: 30px; ">ManFisher</h1>
+	<p style="margin: 0 0 9px; font-size: 13px; line-height: 18px;">a note from the mastermind behind footnotes</p>
+
+	<h2 style="margin: 0; color: rgb(64, 64, 64); line-height: 36px; font-size: 24px; ">Ideology</h2>
+	<p style="margin: 0 0 9px; font-size: 13px; line-height: 18px;">You know WordPress is a great community effort and boatloads of people are involved and spending their spare time to freely (free as in money) contribute to WordPress as a platform or at the very core. Our aim as developers and those gravitating around developer's halos is to give back to the community with our own ideas which we think are great and well worth our whiles to put our own time into. For some of us, it would be a huge honour to serve the WordPress core developer team.</p>
+
+	<h2 style="margin: 0; color: rgb(64, 64, 64); line-height: 36px; font-size: 24px; ">the footnotes mastermind</h2>
+	<p style="margin: 0 0 9px; font-size: 13px; line-height: 18px;">... only recently took it on himself to start up a company to fuel the (financial and fatherly) needs of his family. So far it's been running dang fine, as you might have guessed. Only God knows what the future will hold. And while definitely trusting God it would be unwise to be foolish, right?</p>
+	<h2 style="margin: 0;color: rgb(64, 64, 64); line-height: 36px; font-size: 24px; ">the ManFisher menu</h2>
+	<p style="margin: 0 0 9px; font-size: 13px; line-height: 18px;">Word about my company "ManFisher Media ManuFactory" needs to be spread. And this new "ManFisher" menu is a small yet bearable way of telling the world that there's a WordPress dedicated company on the market that's one of the few who understand WordPress as an approach and as a style of development. And to be honest: I didn't even come up with this idea in the first place! Some of you may be confused, as to why this step was taken and why stuff is now in this menu.</p>
+	<p style="font-size: 13px; line-height: 18px;">Let me explain:</p>
+	<p style="font-size: 13px; line-height: 18px;">We have already developed 5 Plugins and my head is still spinning with ideas with not necessarily new Plugin ideas but definitely unique ideas worth of their own Plugin. Such as footnotes is appreciated by many users for its well researched underlying paradigms, a host of new Plugins are in the process of being planned and developed which will all boast the same kind of dedication and craftsmenship. To give all those ideas a future and common home, we've put it into this one comprehensive menu. So hopefully users will appreciate this and take the logo of "ManFisher" as a quality assurance label and put forth trust into the company and its likable guys.</p>
+	<p style="font-size: 13px; line-height: 18px;">You are now officially allowed to be excited about all that is to come.</p>
+</div>
\ No newline at end of file
diff --git a/templates/dashboard/other-plugins.html b/templates/dashboard/other-plugins.html
index 86c9c0c..2817475 100644
--- a/templates/dashboard/other-plugins.html
+++ b/templates/dashboard/other-plugins.html
@@ -26,8 +26,11 @@
 		},
 		dataType: 'json',
 		success: function (data, textStatus, XMLHttpRequest) {
-			if (data.error) {
-				alert(data.error);
+			if (data == null) {
+				jQuery("#[[name]]-description").text("No response received.");
+			} else if (data.error) {
+				console.log(data.error);
+				jQuery("#[[name]]-description").text(data.error);
 			} else {
 				jQuery("#[[name]]-url").attr("href", data.PluginUrl);
 				jQuery("#[[name]]-website").attr("href", data.PluginUrl);
diff --git a/templates/public/footnote.html b/templates/public/footnote.html
index 35de087..360585c 100755
--- a/templates/public/footnote.html
+++ b/templates/public/footnote.html
@@ -1,14 +1,2 @@
 <a href="#footnote_plugin_reference_[[index]]" name="footnote_plugin_tooltip_[[index]]" id="footnote_plugin_tooltip_[[index]]" class="footnote_plugin_tooltip_text" onclick="footnote_expand_reference_container();"><sup>[[before]][[index]][[after]]</sup></a>
-<span class="footnote_tooltip" id="footnote_plugin_tooltip_text_[[index]]">[[text]]</span>
-<script type="text/javascript">
-	jQuery("#footnote_plugin_tooltip_[[index]]").tooltip({
-		tip: "#footnote_plugin_tooltip_text_[[index]]",
-		tipClass: "footnote_tooltip",
-		effect: "fade",
-		fadeOutSpeed: 100,
-		predelay: 400,
-		position: "top right",
-		relative: true,
-		offset: [10, 10]
-	});
-</script>
\ No newline at end of file
+<span class="footnote_tooltip" id="footnote_plugin_tooltip_text_[[index]]">[[text]]</span>
\ No newline at end of file
diff --git a/templates/public/tooltip.html b/templates/public/tooltip.html
new file mode 100644
index 0000000..a5a4466
--- /dev/null
+++ b/templates/public/tooltip.html
@@ -0,0 +1,12 @@
+<script type="text/javascript">
+	jQuery("#footnote_plugin_tooltip_[[index]]").tooltip({
+		tip: "#footnote_plugin_tooltip_text_[[index]]",
+		tipClass: "footnote_tooltip",
+		effect: "fade",
+		fadeOutSpeed: 100,
+		predelay: 400,
+		position: "top right",
+		relative: true,
+		offset: [10, 10]
+	});
+</script>
\ No newline at end of file