diff --git a/administrator/templates/bluestork/css/template_rtl.css b/administrator/templates/bluestork/css/template_rtl.css
index 6e5eb4f8965f2..e2020b803771d 100644
--- a/administrator/templates/bluestork/css/template_rtl.css
+++ b/administrator/templates/bluestork/css/template_rtl.css
@@ -12,6 +12,10 @@ body{
 	direction: rtl;
 }
 
+h1, h2, h3 {
+	text-align: right;
+}
+
 #border-top span.logo {
 	float: left;
 	padding-left:15px;
@@ -244,12 +248,6 @@ div.col{
 	text-indent: 35px;
 }
 
-/* debug */
-#system-debug ol,
-#system-debug ul{
-	direction: ltr;
-}
-
 /* -- LOGIN STYLES ----------------------------- */
 
 #section-box{
diff --git a/administrator/templates/hathor/css/template_rtl.css b/administrator/templates/hathor/css/template_rtl.css
index a15bc7b07a63d..5ed9f77c6085e 100644
--- a/administrator/templates/hathor/css/template_rtl.css
+++ b/administrator/templates/hathor/css/template_rtl.css
@@ -15,6 +15,10 @@ body {
 	direction: rtl;
 }
 
+h1, h2, h3 {
+	text-align: right;
+}
+
 /**
  * CSS Reset
  */
diff --git a/components/com_media/media.php b/components/com_media/media.php
index 686a0e925ec2b..e7a63ca660ad3 100644
--- a/components/com_media/media.php
+++ b/components/com_media/media.php
@@ -29,10 +29,8 @@
 define('COM_MEDIA_BASEURL', JURI::root().'/'.$params->get('image_path', 'images'));
 
 $lang = JFactory::getLanguage();
-	$lang->load($option, JPATH_ADMINISTRATOR, null, false, false)
-||	$lang->load($option, JPATH_COMPONENT_ADMINISTRATOR, null, false, false)
-||	$lang->load($option, JPATH_ADMINISTRATOR, $lang->getDefault(), false, false)
-||	$lang->load($option, JPATH_COMPONENT_ADMINISTRATOR, $lang->getDefault(), false, false);
+	$lang->load('com_media', JPATH_ADMINISTRATOR, null, false, false)
+	||	$lang->load('com_media', JPATH_ADMINISTRATOR, $lang->getDefault(), false, false);
 
 // Load the admin HTML view
 require_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/media.php';
diff --git a/installation/CHANGELOG b/installation/CHANGELOG
index bbe3bec0e72f1..0211cebff72c3 100644
--- a/installation/CHANGELOG
+++ b/installation/CHANGELOG
@@ -27,6 +27,12 @@ $ -> Language fix or change
 - -> Removed
 ! -> Note
 
+15-Dec-2011 Christophe Demko
+ # [#27382] Add appropriatestyling to system debug plugin (Andrea Tarr)
+
+15-Dec-2011 Jean-Marie Simonet
+ # [#27393] undefined $option com_media
+
 14-Dec-2011 Jean-Marie Simonet
  # [#27383] PHP 5.3 Strict Mode complains about Strict Standards on some methods. Thanks Jean-Claude
 
diff --git a/media/system/css/system.css b/media/system/css/system.css
index 6bf505af952ce..8eb75b4cdfd98 100644
--- a/media/system/css/system.css
+++ b/media/system/css/system.css
@@ -67,3 +67,249 @@
 	background-image: url(../images/notice-note.png);
 	border-color: #F0DC7E;
 }
+
+/* Common CSS for system debug */
+div#system-debug {
+	clear: both;
+}
+
+#system-debug {
+	background-color: #fff;
+	color: #000;
+	border: 1px dashed silver;
+	padding: 5px;
+	text-align: left;
+}
+
+#system-debug div.dbgHeader {
+	background-color: #ddd;
+	border: 1px solid #eee;
+	font-size: 16px;
+}
+
+#system-debug h3 {
+	margin: 0;
+}
+
+#system-debug a h3 {
+	background-color: #ddd;
+	color: #000;
+	font-size: 14px;
+	padding: 5px;
+	text-decoration: none;
+	margin: 0px;
+}
+
+#system-debug a:hover,
+#system-debug a:focus,
+#system-debug a:active,
+#system-debug a:link,
+#system-debug a:visited {
+	background-color: #ddd;
+	color: #000;
+	text-decoration:none;
+}
+
+#system-debug a:hover h3,
+#system-debug a:focus h3 {
+	background-color: #4d4d4d;
+	color: #ddd;
+	font-size: 14px;
+	cursor: pointer;
+	text-decoration:none;
+}
+
+#system-debug div.dbgContainer {
+	padding: 10px;
+}
+
+#system-debug span.dbgCommand {
+	color: blue;
+	font-weight: bold;
+}
+
+#system-debug span.dbgTable {
+	color: green;
+	font-weight: bold;
+}
+
+#system-debug b.dbgOperator {
+	color: red;
+	font-weight: bold;
+}
+
+#system-debug h1 {
+	background-color: #2c2c2c;
+	color: #fff;
+	padding: 10px;
+	margin: 0;
+	font-size: 16px;
+	line-height: 1em;
+}
+
+#system-debug h4 {
+	font-size: 14px;
+	font-weight:bold;
+	margin: 5px 0 0 0;
+}
+
+#system-debug h5 {
+	font-size: 13px;
+	font-weight:bold;
+	margin: 5px 0 0 0;
+}
+
+div#system-debug {
+	margin: 5px;
+}
+
+#system-debug ol {
+	margin-left: 25px;
+	margin-right: 25px;
+	text-align: left;
+	direction: ltr;
+}
+
+#system-debug ul {
+	list-style: none;
+	text-align: left;
+	direction: ltr;
+}
+
+#system-debug li {
+	font-size: 13px;
+	margin-bottom: 10px;
+}
+
+#system-debug code {
+	font-size: 13px;
+	text-align: left;
+	direction: ltr;
+}
+
+#system-debug p {
+	font-size: 13px;
+}
+
+
+/* Common CSS for system debug */
+
+#system-debug {
+	background-color: #fff;
+	color: #000;
+	border: 1px dashed silver;
+	padding: 10px;
+}
+
+#system-debug div.dbgHeader {
+	background-color: #ddd;
+	border: 1px solid #eee;
+	font-size: 16px;
+}
+
+#system-debug h3 {
+	margin: 0;
+}
+
+#system-debug a h3 {
+	background-color: #ddd;
+	color: #000;
+	font-size: 14px;
+	padding: 5px;
+	text-decoration: none;
+	margin: 0px;
+}
+
+#system-debug .dbgerror a h3 {
+	background-color: red;
+}
+
+#system-debug a:hover,
+#system-debug a:focus,
+#system-debug a:active,
+#system-debug a:link,
+#system-debug a:visited {
+	background-color: #ddd;
+	color: #000;
+	text-decoration:none;
+}
+
+#system-debug a:hover h3,
+#system-debug a:focus h3 {
+	background-color: #4d4d4d;
+	color: #ddd;
+	font-size: 14px;
+	cursor: pointer;
+	text-decoration:none;
+}
+
+#system-debug div.dbgContainer {
+	padding: 10px;
+}
+
+#system-debug span.dbgCommand {
+	color: blue;
+	font-weight: bold;
+}
+
+#system-debug span.dbgTable {
+	color: green;
+	font-weight: bold;
+}
+
+#system-debug b.dbgOperator {
+	color: red;
+	font-weight: bold;
+}
+
+#system-debug h1 {
+	background-color: #2c2c2c;
+	color: #fff;
+	padding: 10px;
+	margin: 0;
+	font-size: 16px;
+	line-height: 1em;
+}
+
+#system-debug h4 {
+	font-size: 14px;
+	font-weight:bold;
+}
+
+#system-debug h5 {
+	font-size: 13px;
+	font-weight:bold;
+	margin-top: 5px;
+}
+
+div#system-debug {
+	margin: 5px;
+}
+
+#system-debug ol {
+	margin-left: 25px;
+	margin-right: 25px;
+}
+
+#system-debug ul {
+	list-style: none;
+}
+
+#system-debug li {
+	font-size: 13px;
+	margin-bottom: 10px;
+}
+
+#system-debug code {
+	font-size: 13px;
+	text-align: left;
+	direction: ltr;
+}
+
+#system-debug p {
+	font-size: 13px;
+}
+
+#system-debug div.dbgHeader.dbgerror {
+	background-color: red;
+}
diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index c07228ae78058..09612f542f9ee 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -101,18 +101,6 @@ public function __destruct()
 
 		$html = '';
 
-		// Some "eyeprotecting" CSS
-		$html .= '<style>
-		#system-debug { background-color: #fff; border: 1px dashed silver;}
-		div.dbgHeader { background-color: #cccccc; border: 1px solid #eee; font-size: 16px; }
-		div.dbgHeader:hover { background-color: #fff; border: 1px solid silver; cursor: pointer; }
-		div.dbgContainer { padding: 0.5em; }
-		span.dbgCommand { color: blue; }
-		span.dbgTable { color: green; }
-		b.dbgOperator { color: orange; }
-		#system-debug h1 { background-color: black; color: lime; padding: 0.3em; font-family: monospace; margin: 0; }
-		</style>';
-
 		// Some "mousewheel protecting" JS
 		$html .= "<script>function toggleContainer(name) {
 			var e = document.getElementById(name);// MooTools might not be available ;)
@@ -155,7 +143,8 @@ public function __destruct()
 		{
 			if ($this->params->get('language_errorfiles', 1))
 			{
-				$html .= $this->display('language_files_in_error');
+				$languageErrors = JFactory::getLanguage()->getErrorFiles();
+				$html .= $this->display('language_files_in_error', $languageErrors);
 			}
 
 			if ($this->params->get('language_files', 1))
@@ -177,14 +166,22 @@ public function __destruct()
 	/**
 	 * General display method.
 	 *
-	 * @param   string  $item  The item to display
+	 * @param   string  $item    The item to display
+	 * @param   array   $errors  Errors occured during execution
 	 *
 	 * @return string
 	 */
-	protected function display($item)
+	protected function display($item, array $errors = array())
 	{
 		$title = JText::_('PLG_DEBUG_'.strtoupper($item));
 
+		$status = '';
+
+		if(count($errors))
+		{
+			$status = ' dbgerror';
+		}
+
 		$fncName = 'display'.ucfirst(str_replace('_', '', $item));
 
 		if ( ! method_exists($this, $fncName))
@@ -196,7 +193,9 @@ protected function display($item)
 
 		$js = "toggleContainer('dbgContainer".$item."');";
 
-		$html .= '<div class="dbgHeader" onclick="'.$js.'">'.$title.'</div>';
+		$class = 'dbgHeader'.$status;
+
+		$html .= '<div class="'.$class.'" onclick="'.$js.'"><a href="javascript:void(0);"><h3>'.$title.'</h3></a></div>';
 
 		$style = ' style="display: none;"';//@todo set with js.. ?
 
@@ -254,7 +253,7 @@ protected function displaySession($key = '', $session = null, $id = 0)
 				{
 					$js = "toggleContainer('dbgContainer_session".$id."');";
 
-					$html .= '<div class="dbgHeader" onclick="'.$js.'">'.$sKey.'</div>';
+					$html .= '<div class="dbgHeader" onclick="'.$js.'"><a href="javascript:void(0);"><h3>'.$sKey.'</h3></a></div>';
 
 					$style = ' style="display: none;"';//@todo set with js.. ?
 
@@ -269,7 +268,9 @@ protected function displaySession($key = '', $session = null, $id = 0)
 					continue;
 				}
 
+				$html .= '<code>';
 				$html .= $sKey.' &rArr; '.$entries.'<br />';
+				$html .= '</code>';
 			}
 		}
 
@@ -338,8 +339,10 @@ protected function displayMemoryUsage()
 
 		$bytes = JProfiler::getInstance('Application')->getMemory();
 
+		$html .= '<code>';
 		$html .= JHtml::_('number.bytes', $bytes);
 		$html .= ' ('.number_format($bytes).' Bytes)';
+		$html .= '</code>';
 
 		return $html;
 	}
@@ -415,7 +418,7 @@ protected function displayQueries()
 
 			$text = $this->highlightQuery($sql);
 
-			$html .= '<li>'.$text.'</li>';
+			$html .= '<li><code>'.$text.'</code></li>';
 		}
 
 		$html .= '</ol>';
@@ -442,8 +445,8 @@ protected function displayQueries()
 
 			foreach ($selectQueryTypeTicker as $query => $occurrences)
 			{
-				$html .= '<li>'.JText::sprintf('PLG_DEBUG_QUERY_TYPE_AND_OCCURRENCES'
-				, $this->highlightQuery($query), $occurrences).'</li>';
+				$html .= '<li><code>'.JText::sprintf('PLG_DEBUG_QUERY_TYPE_AND_OCCURRENCES'
+				, $this->highlightQuery($query), $occurrences).'</code></li>';
 			}
 
 			$html .= '</ol>';
@@ -459,8 +462,8 @@ protected function displayQueries()
 
 			foreach ($otherQueryTypeTicker as $query => $occurrences)
 			{
-				$html .= '<li>'.JText::sprintf('PLG_DEBUG_QUERY_TYPE_AND_OCCURRENCES'
-				, $this->highlightQuery($query), $occurrences).'</li>';
+				$html .= '<li><code>'.JText::sprintf('PLG_DEBUG_QUERY_TYPE_AND_OCCURRENCES'
+				, $this->highlightQuery($query), $occurrences).'</code></li>';
 			}
 			$html .= '</ol>';
 		}
@@ -481,7 +484,9 @@ protected function displayLanguageFilesInError()
 
 		if ( ! count($errorfiles))
 		{
-			return JText::_('JNONE');
+			$html .= '<p>' . JText::_('JNONE') . '</p>';
+
+			return $html;
 		}
 
 		$html .= '<ul>';
@@ -542,9 +547,13 @@ protected function displayUntranslatedStrings()
 
 		$orphans = JFactory::getLanguage()->getOrphans();
 
+		$html = '';
+
 		if ( ! count($orphans))
 		{
-			return JText::_('JNONE');
+			$html .= '<p>' . JText::_('JNONE') . '</p>';
+
+			return $html;
 		}
 
 		ksort($orphans, SORT_STRING);
@@ -607,7 +616,6 @@ protected function displayUntranslatedStrings()
 			}
 		}
 
-		$html = '';
 
 		foreach ($guesses as $file => $keys)
 		{
diff --git a/templates/beez5/css/template_rtl.css b/templates/beez5/css/template_rtl.css
index 07af7e27df36f..8d09acfc71486 100644
--- a/templates/beez5/css/template_rtl.css
+++ b/templates/beez5/css/template_rtl.css
@@ -202,10 +202,6 @@ form fieldset dd
 .login-fields label
 {float:right}
 
-#system-debug li {
-direction: ltr;
-}
-
 /* ++++++++++++++  pagination  ++++++++++++++ */
 
 #main .pagination
diff --git a/templates/beez_20/css/template_rtl.css b/templates/beez_20/css/template_rtl.css
index 642e25f763efb..33880bb057f3e 100644
--- a/templates/beez_20/css/template_rtl.css
+++ b/templates/beez_20/css/template_rtl.css
@@ -290,10 +290,6 @@ form fieldset dd
 .login-fields label
 {float:right}
 
-#system-debug li {
-direction: ltr;
-}
-
 /* ++++++++++++++  pagination  ++++++++++++++ */
 
 #main .pagination
diff --git a/templates/system/css/system.css b/templates/system/css/system.css
index 990983431d1a6..0f92789fb0e44 100644
--- a/templates/system/css/system.css
+++ b/templates/system/css/system.css
@@ -12,11 +12,4 @@
 background: #e8edf1;
 border-top: 4px solid #c4d3df;
 border-bottom: 4px solid #c4d3df;
-}
-
-/* Debug */
-#system-debug     { color: #777; background-color: #eee; padding: 10px; margin: 10px; text-align: left; }
-#system-debug div { font-size: 11px;  font-family: monospace; }
-#system-debug ol  { padding-left: 1.5em; }
-#system-debug ol li { font-size: 11px; margin-bottom: 0.5em; font-family: monospace; }
-#system-debug h4 { margin-bottom: 0.5em; margin-top: 1.0em; }
+}
\ No newline at end of file