diff --git a/modernized.py b/acaro.py
similarity index 99%
rename from modernized.py
rename to acaro.py
index ad425dd..47e0ca4 100644
--- a/modernized.py
+++ b/acaro.py
@@ -12,7 +12,7 @@ from MoinMoin.Page import Page
 
 class Theme(ThemeBase):
 
-    name = "modernized"
+    name = "acaro"
 
     _ = lambda x: x     # We don't have gettext at this moment, so we fake it
     icons = {
diff --git a/css/common.css b/css/common.css
index 965a99c..dbc2640 100644
--- a/css/common.css
+++ b/css/common.css
@@ -8,7 +8,7 @@ Copyright (c) 2001, 2002, 2003 by Juergen Hermann
 html {
     background-color: white;
     color: black;
-    font-family: sans-serif;
+    font-family: monospace;
     font-size: 1em;
 }
 
@@ -132,7 +132,6 @@ td p {
 /* TableOfContents macro */
 div.table-of-contents {
     border: 1px solid #bbbbbb;
-    color: black;
     background-color: #eeeeee;
     font-size: 80%;
     text-align: left;
@@ -315,7 +314,6 @@ div.codemsg {
     background-image:url('../img/alert.png');
     background-repeat:no-repeat;
     background-position: 0.5em 0.5em;
-    color: black;
 }
 
 div.codearea { /* the div makes the border */
@@ -323,7 +321,6 @@ div.codearea { /* the div makes the border */
     padding: 0;
     border: 1pt solid #AEBDCC;
     background-color: #F3F5F7;
-    color: black;
 }
 
 div.codearea pre { /* the pre has no border and is inside the div */
@@ -490,7 +487,6 @@ th.cal-header {
 
 /* for MonthCalendar mouseover info boxes */
 TABLE.tip {
-    color: black;
     background-color: #FF8888;
     font-size: small;
     font-weight: normal;
@@ -517,7 +513,6 @@ TD.tip {
 #message .info {
     float: none;
     font-size: 1em;
-    color: black;
 }
 #message .info:before {content: url('../img/icon-info.png'); margin: 0 0.2em;}
 #message .warning:before {content: url('../img/alert.png'); margin: 0 0.2em;}
@@ -532,7 +527,6 @@ TD.tip {
 #content div.warning {
     border: 1pt solid #E5E5E5;
     background-color: #F9F9FF;
-    color: black;
 
     margin: 10pt 30pt 10pt 30pt;
     background-repeat: no-repeat;
diff --git a/css/screen.css b/css/screen.css
index 0a25a26..dc1c42c 100644
--- a/css/screen.css
+++ b/css/screen.css
@@ -53,7 +53,6 @@ textarea {
 #header {
     margin: 1px;
     padding: 1px;
-    background: #e6eaf0;
     line-height: 1.1em;
 }
 
@@ -76,7 +75,6 @@ textarea {
 }
 
 #logo a {
-    color: black;
     text-decoration: none;
 }
 
@@ -179,7 +177,7 @@ textarea {
     display: inline;
     margin: 0 2px;
     padding: 2px 5px;
-    border: 1px solid #acd;
+    border: 1px solid #aaaaaa;
     border-bottom: none;
     white-space: nowrap;
 }
@@ -189,15 +187,12 @@ textarea {
 }
 
 #navibar li.wikilink {
-    background: white; /*url(../img/tab-wiki.png) repeat-x;*/
 }
 
 #navibar li.userlink {
-    background: #E6EAF0; /*url(../img/tab-user.png) repeat-x;*/
 }
 
 #navibar a, #navibar a:visited {
-    color: black;
     text-decoration: none;    
 }
 
@@ -206,13 +201,11 @@ textarea {
 }
 
 #navibar li:hover {
-    background: #d6e4f9;
 }
 
 #navibar li.current, #navibar li.current:hover {
-    background: #81BBF2; /* url(../img/tab-selected.png) repeat-x; */
-    border: 1px solid #4d7da9;
-    border-bottom: 1px solid #81bbf2;
+    border: 1px solid #333333;
+    border-bottom: 1px solid #ffffff;
     margin-bottom: -1px;
 }
 
@@ -224,9 +217,8 @@ textarea {
     /* sync these values, line-height is needed for IE */
     height: 4px;
     line-height: 4px;
-    border-bottom: 1px solid #4d7da9;
-    border-top: 1px solid #4d7da9;
-    background: #81BBF2;
+    border-bottom: 1px solid #333333;
+    border-top: 1px solid #333333;
 }
 
 .editbar {
@@ -234,10 +226,9 @@ textarea {
     display: block;
     margin: 0;
     padding: 2px 8px;
-    background: #d6e4f9;
     font-size: 0.8em;
-    border-bottom: 1px solid #4d7da9;
-    border-top: 1px solid #4d7da9;
+    border-bottom: 1px solid #333333;
+    border-top: 1px solid #333333;
     margin-top: -1px;
 }
 
@@ -301,9 +292,8 @@ textarea {
 }
 
 #page {
-    background-color: white;
-    margin: 0;
     padding: 2px 20px 20px 20px;
+    max-width: 65em;
 
     /* theses are some Firefox 1.5b1 specific extensions, see also the CSS3 draft.
     -moz-column-width: 25em;
@@ -318,8 +308,6 @@ textarea {
 #editor-textarea, #editor-help {
     font-family: monospace;
     border: 1px solid #8cacbb;  
-    color: black;
-    background-color: white;
     padding: 3px;
     width: 100%;
     margin-top: 0.5em;
@@ -333,8 +321,6 @@ textarea {
 #editor-comment {
     font-size: 100%;
     border: 1px solid #8cacbb;
-    color: black;
-    background-color: white;
     vertical-align: middle;
     padding: 1px;
     display: inline;
@@ -353,7 +339,6 @@ textarea {
     font-size: 100%;
     margin-top: 0.5em;
     border: 2px solid #FF8888;
-    color: black;
     vertical-align: middle;
     padding: 3px 2px;
 }
@@ -366,7 +351,6 @@ textarea {
 input.button {
     /*
     border: 1px solid #8cacbb;  
-    color: black;
     background-color: #CCCCCC;
     vertical-align: middle;
     text-decoration: none;