5 files changed, 27 insertions, 28 deletions
diff --git a/template/yoga/default-colors.css b/template/yoga/default-colors.css
index 74ba33ac2..933098f21 100644
--- a/template/yoga/default-colors.css
+++ b/template/yoga/default-colors.css
@@ -43,7 +43,7 @@ INPUT.radio, INPUT.checkbox {
 /* rate buttons displayed like links */
 INPUT.rateButton, INPUT.rateButtonSelected, INPUT.rateButtonStarFull, INPUT.rateButtonStarEmpty {
 	color:inherit;
-	background-color:transparent;	/* Konqueror doesn't accept transparent here */
+	background-color:transparent !important;	/* Konqueror doesn't accept transparent here */
 }
 
 .errors { /* Errors display */
diff --git a/template/yoga/default-layout.css b/template/yoga/default-layout.css
index 019a2b6f2..9615b0183 100644
--- a/template/yoga/default-layout.css
+++ b/template/yoga/default-layout.css
@@ -29,9 +29,7 @@ A {
 A:hover {
 	border-bottom: 1px solid #858460;
 }
-A.button, A.button:hover { 
-	border: 0; 
-}
+
 IMG {
 	border: none;
 }
diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl
index e6e289612..f76919ca7 100644
--- a/template/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -29,7 +29,6 @@
 	<link rel="stylesheet" href="{$ROOT_URL}template/{$themeconf.template}/not-ie.css" type="text/css">
 <!--> <![endif]-->
 <link rel="stylesheet" type="text/css" media="print" href="{$ROOT_URL}template/{$themeconf.template}/print.css">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/default-colors.css">
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
 {$themeconf.local_head}
 {if isset($U_PREFETCH)          }<link rel="prefetch" href="{$U_PREFETCH}">{/if}
diff --git a/template/yoga/layout.css b/template/yoga/layout.css
index 348ea2f4c..8e7dd7913 100644
--- a/template/yoga/layout.css
+++ b/template/yoga/layout.css
@@ -13,3 +13,5 @@
 /* Override properties with import local file */
 @import "../../template-common/local-layout.css";
 
+@import "default-colors.css";
+
diff --git a/template/yoga/picture.css b/template/yoga/picture.css
index f753009b3..83825b193 100644
--- a/template/yoga/picture.css
+++ b/template/yoga/picture.css
@@ -1,43 +1,43 @@
 /* $Id$ */
 #imageHeaderBar {
-  padding-top: 2px;
-  padding-bottom: 2px;
-  margin-top: 4px;
-  overflow: hidden;
-  width: 100%;
+	padding-top: 2px;
+	padding-bottom: 2px;
+	margin-top: 4px;
+	overflow: hidden;
+	width: 100%;
 }
 
 #imageHeaderBar .browsePath {
-  float: left;
-  margin-left: 10px;
+	float: left;
+	margin-left: 10px;
 }
 
 #imageHeaderBar .imageNumber {
-  float: right;
-  margin-right: 10px;
+	float: right;
+	margin-right: 10px;
 }
 
 #imageHeaderBar H2 {
-  text-align: center;
-  padding: 0;
-  clear: both;
+	text-align: center;
+	padding: 0;
+	clear: both;
 }
 
 #imageToolBar {
-  text-align: center;
-  position: relative;
-  clear: both;
-  margin-bottom: 4px;
-  padding: 0;
+	text-align: center;
+	position: relative;
+	clear: both;
+	margin-bottom: 4px;
+	padding: 0;
 }
 
 #imageToolBar {
-    height: 28px;
+	height: 28px;
 }
 #imageToolBar A, #imageToolBar IMG {
-    display: block;
-    border: none;
-    margin: 0; padding: 0;
+	display: block;
+	border: none;
+	margin: 0; padding: 0;
 }
 #imageToolBar A { width: 48px; }
 #imageToolBar IMG { margin: 2px auto; }
@@ -45,8 +45,8 @@
 #imageToolBar .navButtons    A { float: right; }
 
 #theImage {
-    clear: left;
-    text-align: center;
+	clear: left;
+	text-align: center;
 }
 
 #theImage>IMG {