diff --git a/src/common/config.py b/src/common/config.py
index a94298375..e05c562e8 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -74,7 +74,7 @@ class Config:
 		'markedmsgcolor': [ opt_color, '#ff8080', '', True ],
 		'urlmsgcolor': [ opt_color, '#0000ff', '', True ],
 		'collapsed_rows': [ opt_str, '', '', True ],
-		'roster_theme': [ opt_str, 'system', '', True ],
+		'roster_theme': [ opt_str, 'gtk+', '', True ],
 		'saveposition': [ opt_bool, True ],
 		'mergeaccounts': [ opt_bool, False, '', True ],
 		'sort_by_show': [ opt_bool, True, '', True ],
@@ -300,6 +300,8 @@ class Config:
 
 	themes_default = {
 		# sorted alphanum
+		'gtk+': [ '', '', '', 'B', '', '','', 'I', '', '', '', '', '','' ],
+		
 		_('green'): [ '', '#94aa8c', '', 'B', '#0000ff', '#eff3e7',
 					'', 'I', '#000000', '', '', '', '',
 					'#94aa8c' ],
@@ -315,9 +317,7 @@ class Config:
 		_('marine'): [ '', '#918caa', '', 'B', '', '#e9e7f3',
 					'', 'I', '#000000', '', '', '', '',
 					'#918caa' ],
-		
-		_('system'): [ '', '', '', 'B', '', '','', 'I', '', '', '', '', '','' ],
-		
+
 	}
 	
 	ft_proxies65_default = {
diff --git a/src/gajim.py b/src/gajim.py
index ac0556b75..159b38d4b 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1602,7 +1602,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', 'green')
+			gajim.config.set('roster_theme', 'gtk+')
 		if len(gajim.config.get_per('themes')) == 0:
 			d = ['accounttextcolor', 'accountbgcolor', 'accountfont',
 				'accountfontattrs', 'grouptextcolor', 'groupbgcolor', 'groupfont',