diff --git a/src/common/config.py b/src/common/config.py
index 4d44d037d..6875ecfa2 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -69,7 +69,7 @@ class Config:
 		'statusmsgcolor': [ opt_color, '#1eaa1e' ],
 		'markedmsgcolor': [ opt_color, '#ff8080' ],
 		'collapsed_rows': [ opt_str, '' ],
-		'roster_theme': [ opt_str, 'GTK+' ],
+		'roster_theme': [ opt_str, 'green' ],
 		'saveposition': [ opt_bool, True ],
 		'mergeaccounts': [ opt_bool, False ],
 		'sort_by_show': [ opt_bool, True ],
@@ -326,19 +326,25 @@ class Config:
 	}
 
 	themes_default = {
-		'GTK+': [ '', '', '', 'B', '', '','', 'I', '', '', '', '', '','' ],
-		'green': [ '#ffffff', '#94aa8c', '', 'B', '#0000ff', '#eff3e7',
-					'', 'I', '#000000', '#ffffff', '', '', '#ffffff',
-					'#94aa8c' ],
+		# sorted alphanum
 		'cyan': [ '#ff0000', '#9fdfff', '', 'B', '#0000ff', '#ffffff',
 					'', 'I', '#000000', '#ffffff', '', '', '#ffffff',
 					'#9fdfff' ],
-		'marine': [ '#ffffff', '#918caa', '', 'B', '#0000ff', '#e9e7f3',
+					
+		'green': [ '#ffffff', '#94aa8c', '', 'B', '#0000ff', '#eff3e7',
 					'', 'I', '#000000', '#ffffff', '', '', '#ffffff',
-					'#918caa' ],
+					'#94aa8c' ],
+		
 		'human': [ '#ffffff', '#996442', '', 'B', '#ab5920', '#e3ca94',
 					'', 'I', '#000000', '#ffffff', '', '', '#ffffff',
 					'#996442' ],
+					
+		'marine': [ '#ffffff', '#918caa', '', 'B', '#0000ff', '#e9e7f3',
+					'', 'I', '#000000', '#ffffff', '', '', '#ffffff',
+					'#918caa' ],
+					
+		'plain': [ '', '', '', 'B', '', '','', 'I', '', '', '', '', '','' ],
+		
 	}
 	
 	ft_proxies65_default = {
diff --git a/src/config.py b/src/config.py
index 4b0f25dcf..af5ca7d2c 100644
--- a/src/config.py
+++ b/src/config.py
@@ -442,7 +442,7 @@ class PreferencesWindow:
 		if event.keyval == gtk.keysyms.Escape:
 			self.window.hide()
 
-	def on_checkbutton_toggled(self, widget, config_name, \
+	def on_checkbutton_toggled(self, widget, config_name,
 		change_sensitivity_widgets = None):
 		gajim.config.set(config_name, widget.get_active())
 		if change_sensitivity_widgets:
diff --git a/src/gajim.py b/src/gajim.py
index 8f8b93089..4e7364064 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1234,7 +1234,7 @@ class Interface:
 		#add default themes if there is not in the config file
 		theme = gajim.config.get('roster_theme')
 		if not theme in gajim.config.get_per('themes'):
-			gajim.config.set('roster_theme', 'GTK+')
+			gajim.config.set('roster_theme', 'green')
 		if len(gajim.config.get_per('themes')) == 0:
 			d = ['accounttextcolor', 'accountbgcolor', 'accountfont', 'accountfontattrs',
 				'grouptextcolor', 'groupbgcolor', 'groupfont', 'groupfontattrs',