diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index 25a6390a2..dbf65bbbc 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -49,9 +49,8 @@
 
 			print "<div align='center'>";
 
-			print "<input class=\"button\"
-				type=\"submit\" onclick=\"return opmlImportDone()\" 
-				value=\"".__('Close this window')."\">";
+			print "<button onclick=\"return opmlImportDone()\">".
+				__('Close this window')."</button>";
 
 			print "</div>";
 
diff --git a/themes/neon/theme.css b/themes/neon/theme.css
index 67b2df59f..9f67981a3 100644
--- a/themes/neon/theme.css
+++ b/themes/neon/theme.css
@@ -56,6 +56,11 @@ option {
 	color : #b077ec;
 }
 
+button[disabled], input[disabled], select[disabled], textarea[disabled] {
+	background : #404040;
+	color : gray;
+}
+
 input, select, button {
 	background : #3c2c4c;
 	border : 1px solid black;
@@ -324,7 +329,7 @@ div.notice {
 
 div.tagCloudContainer {
 	border : 1px solid #404040;
-	background : #202020;
+	background : #303030;
 }
 
 div.tagCloudContainer a:hover {
@@ -423,12 +428,12 @@ table.prefFilterList td.filterEditCat {
 
 ul.browseFeedList, ul.userFeedList {
 	border : 1px solid #404040;
-	background : #202020;
+	background : #303030;
 }
 
 div.prefFeedCatHolder {
 	border : 1px solid #404040;
-	background-color : #202020;
+	background-color : #303030;
 }
 
 #debug_output {
@@ -534,3 +539,29 @@ table.prefPrefsList tr:hover td.prefValue input {
 	color : #b077ec;
 }
 
+span.groupPrompt {
+	color : #b077ec;
+}
+
+div.labelColorIndicator {
+	border-color : #202020;
+}
+
+div.colorPicker div.colorPickerEntry:hover {
+	border : 1px solid #b077ec;
+}
+
+div.colorPicker div.ccPrompt:hover {
+	color : #b077ec;
+}
+
+div.colorPicker div.colorPickerEntry {
+	border : 1px solid #202020;
+}
+
+div.colorPicker {
+	border : 1px solid #202020;
+	background : #404040;
+	color : gray;
+}
+