this time it should be ok :^)

3 files changed, 92 insertions, 93 deletions

diff --git a/data/themes/dark b/data/themes/dark
index 2acaa966..6e0b6c9d 100644
--- a/data/themes/dark
+++ b/data/themes/dark
@@ -1,58 +1,57 @@
 # A dark theme file.
 # For more informations, see http://codingteam.net/project/poezio/doc/TheThemes
 
-
 # Message text color
 COLOR_NORMAL_TEXT = 0
-COLOR_INFORMATION_TEXT = 6
-COLOR_HIGHLIGHT_TEXT = 4
+COLOR_INFORMATION_TEXT = 5
+COLOR_HIGHLIGHT_TEXT = 3
 
 # User list color
-COLOR_USER_VISITOR = 8
-COLOR_USER_PARTICIPANT = 5
-COLOR_USER_NONE = 1
-COLOR_USER_MODERATOR = 2
+COLOR_USER_VISITOR = 7
+COLOR_USER_PARTICIPANT = 4
+COLOR_USER_NONE = 0
+COLOR_USER_MODERATOR = 1
 
 # The character printed in color (COLOR_STATUS_*) before the nickname
 # in the user list
 CHAR_STATUS = '|'
 
 # Separators
-COLOR_VERTICAL_SEPARATOR = 1
-COLOR_NEW_TEXT_SEPARATOR = 4
+COLOR_VERTICAL_SEPARATOR = 0
+COLOR_NEW_TEXT_SEPARATOR = 2
 
 # Time
-COLOR_TIME_SEPARATOR = 7
+COLOR_TIME_SEPARATOR = 6
 COLOR_TIME_LIMITER = 0
 CHAR_TIME_LEFT = ''
 CHAR_TIME_RIGHT = ''
 COLOR_TIME_NUMBERS = 0
 
 # Tabs
-COLOR_TAB_NORMAL = 58
-COLOR_TAB_CURRENT = 8
-COLOR_TAB_NEW_MESSAGE = 11
-COLOR_TAB_HIGHLIGHT = 9
-COLOR_TAB_PRIVATE = 10
+COLOR_TAB_NORMAL = 57
+COLOR_TAB_CURRENT = 7
+COLOR_TAB_NEW_MESSAGE = 10
+COLOR_TAB_HIGHLIGHT = 8
+COLOR_TAB_PRIVATE = 9
 
 # Nickname colors
 LIST_COLOR_NICKNAMES = [
-    2, 3, 4, 5, 6, 7
+    1, 2, 3, 4, 5, 6
     ]
-COLOR_OWN_NICK = 8
+COLOR_OWN_NICK = 7
 
 # Status color
-COLOR_STATUS_XA = 6
-COLOR_STATUS_NONE = 5
-COLOR_STATUS_DND = 2
-COLOR_STATUS_AWAY = 4
-COLOR_STATUS_CHAT = 3
+COLOR_STATUS_XA = 5
+COLOR_STATUS_NONE = 4
+COLOR_STATUS_DND = 1
+COLOR_STATUS_AWAY = 3
+COLOR_STATUS_CHAT = 2
 
 # Bars
-COLOR_INFORMATION_BAR = 58
-COLOR_TOPIC_BAR = 15
-COLOR_PRIVATE_ROOM_BAR = 10
-COLOR_SCROLLABLE_NUMBER = 11
+COLOR_INFORMATION_BAR = 57
+COLOR_TOPIC_BAR = 14
+COLOR_PRIVATE_ROOM_BAR = 9
+COLOR_SCROLLABLE_NUMBER = 10
 
 # Strings for special messages (like join, quit, nick change, etc)
 
@@ -61,13 +60,13 @@ CHAR_JOIN = '---->'
 CHAR_QUIT = '<----'
 CHAR_KICK = '-!-'
 
-COLOR_JOIN_CHAR = 5
-COLOR_QUIT_CHAR = 2
-COLOR_KICK_CHAR = 2
+COLOR_JOIN_CHAR = 4
+COLOR_QUIT_CHAR = 1
+COLOR_KICK_CHAR = 1
 
 # words between ()
-COLOR_CURLYBRACKETED_WORD = 5
+COLOR_CURLYBRACKETED_WORD = 4
 # words between {}
-COLOR_ACCOLADE_WORD = 7
+COLOR_ACCOLADE_WORD = 6
 # words between []
-COLOR_BRACKETED_WORD = 4
\ No newline at end of file
+COLOR_BRACKETED_WORD = 3
\ No newline at end of file
diff --git a/data/themes/poezio b/data/themes/poezio
index a456d5f1..4bdc367d 100644
--- a/data/themes/poezio
+++ b/data/themes/poezio
@@ -3,55 +3,55 @@
 
 # Message text color
 COLOR_NORMAL_TEXT = 0
-COLOR_INFORMATION_TEXT = 6
-COLOR_HIGHLIGHT_TEXT = 2
+COLOR_INFORMATION_TEXT = 5
+COLOR_HIGHLIGHT_TEXT = 1
 
 # User list color
-COLOR_USER_VISITOR = 8
-COLOR_USER_PARTICIPANT = 5
-COLOR_USER_NONE = 1
-COLOR_USER_MODERATOR = 2
+COLOR_USER_VISITOR = 7
+COLOR_USER_PARTICIPANT = 4
+COLOR_USER_NONE = 0
+COLOR_USER_MODERATOR = 1
 
 # The character printed in color (COLOR_STATUS_*) before the nickname
 # in the user list
 CHAR_STATUS = ' '
 
 # Separators
-COLOR_VERTICAL_SEPARATOR = 5
-COLOR_NEW_TEXT_SEPARATOR = 3
+COLOR_VERTICAL_SEPARATOR = 4
+COLOR_NEW_TEXT_SEPARATOR = 2
 
 # Time
-COLOR_TIME_SEPARATOR = 7
+COLOR_TIME_SEPARATOR = 6
 COLOR_TIME_LIMITER = 0
 CHAR_TIME_LEFT = ''
 CHAR_TIME_RIGHT = ''
 COLOR_TIME_NUMBERS = 0
 
 # Tabs
-COLOR_TAB_NORMAL = 43
-COLOR_TAB_CURRENT = 57
-COLOR_TAB_NEW_MESSAGE = 50
-COLOR_TAB_HIGHLIGHT = 22
-COLOR_TAB_PRIVATE = 29
+COLOR_TAB_NORMAL = 42
+COLOR_TAB_CURRENT = 56
+COLOR_TAB_NEW_MESSAGE = 49
+COLOR_TAB_HIGHLIGHT = 21
+COLOR_TAB_PRIVATE = 28
 
 # Nickname colors
 LIST_COLOR_NICKNAMES = [
-    2, 3, 4, 5, 6, 7
+    1, 2, 3, 4, 5, 6,
     ]
-COLOR_OWN_NICK = 8
+COLOR_OWN_NICK = 7
 
 # Status color
-COLOR_STATUS_XA = 50
+COLOR_STATUS_XA = 49
 COLOR_STATUS_NONE = 0
-COLOR_STATUS_DND = 22
-COLOR_STATUS_AWAY = 36
-COLOR_STATUS_CHAT = 29
+COLOR_STATUS_DND = 21
+COLOR_STATUS_AWAY = 35
+COLOR_STATUS_CHAT = 28
 
 # Bars
-COLOR_INFORMATION_BAR = 43
-COLOR_TOPIC_BAR = 43
-COLOR_PRIVATE_ROOM_BAR = 29
-COLOR_SCROLLABLE_NUMBER = 40
+COLOR_INFORMATION_BAR = 42
+COLOR_TOPIC_BAR = 42
+COLOR_PRIVATE_ROOM_BAR = 28
+COLOR_SCROLLABLE_NUMBER = 39
 
 # Strings for special messages (like join, quit, nick change, etc)
 
@@ -60,13 +60,13 @@ CHAR_JOIN = '---->'
 CHAR_QUIT = '<----'
 CHAR_KICK = '-!-'
 
-COLOR_JOIN_CHAR = 5
-COLOR_QUIT_CHAR = 2
-COLOR_KICK_CHAR = 2
+COLOR_JOIN_CHAR = 4
+COLOR_QUIT_CHAR = 1
+COLOR_KICK_CHAR = 1
 
 # words between ()
-COLOR_CURLYBRACKETED_WORD = 5
+COLOR_CURLYBRACKETED_WORD = 4
 # words between {}
-COLOR_ACCOLADE_WORD = 7
+COLOR_ACCOLADE_WORD = 6
 # words between []
-COLOR_BRACKETED_WORD = 4
+COLOR_BRACKETED_WORD = 3
diff --git a/src/theme.py b/src/theme.py
index 35d983fe..6a0902fe 100644
--- a/src/theme.py
+++ b/src/theme.py
@@ -31,55 +31,55 @@ from config import config
 
 # Message text color
 COLOR_NORMAL_TEXT = 0
-COLOR_INFORMATION_TEXT = 6
-COLOR_HIGHLIGHT_TEXT = 2
+COLOR_INFORMATION_TEXT = 5
+COLOR_HIGHLIGHT_TEXT = 1
 
 # User list color
-COLOR_USER_VISITOR = 8
-COLOR_USER_PARTICIPANT = 5
-COLOR_USER_NONE = 1
-COLOR_USER_MODERATOR = 2
+COLOR_USER_VISITOR = 7
+COLOR_USER_PARTICIPANT = 4
+COLOR_USER_NONE = 0
+COLOR_USER_MODERATOR = 1
 
 # The character printed in color (COLOR_STATUS_*) before the nickname
 # in the user list
 CHAR_STATUS = ' '
 
 # Separators
-COLOR_VERTICAL_SEPARATOR = 5
-COLOR_NEW_TEXT_SEPARATOR = 3
+COLOR_VERTICAL_SEPARATOR = 4
+COLOR_NEW_TEXT_SEPARATOR = 2
 
 # Time
-COLOR_TIME_SEPARATOR = 7
+COLOR_TIME_SEPARATOR = 6
 COLOR_TIME_LIMITER = 0
 CHAR_TIME_LEFT = ''
 CHAR_TIME_RIGHT = ''
 COLOR_TIME_NUMBERS = 0
 
 # Tabs
-COLOR_TAB_NORMAL = 43
-COLOR_TAB_CURRENT = 57
-COLOR_TAB_NEW_MESSAGE = 50
-COLOR_TAB_HIGHLIGHT = 22
-COLOR_TAB_PRIVATE = 29
+COLOR_TAB_NORMAL = 42
+COLOR_TAB_CURRENT = 56
+COLOR_TAB_NEW_MESSAGE = 49
+COLOR_TAB_HIGHLIGHT = 21
+COLOR_TAB_PRIVATE = 28
 
 # Nickname colors
 LIST_COLOR_NICKNAMES = [
-    2, 3, 4, 5, 6, 7
+    1, 2, 3, 4, 5, 6,
     ]
-COLOR_OWN_NICK = 8
+COLOR_OWN_NICK = 7
 
 # Status color
-COLOR_STATUS_XA = 50
+COLOR_STATUS_XA = 49
 COLOR_STATUS_NONE = 0
-COLOR_STATUS_DND = 22
-COLOR_STATUS_AWAY = 36
-COLOR_STATUS_CHAT = 29
+COLOR_STATUS_DND = 21
+COLOR_STATUS_AWAY = 35
+COLOR_STATUS_CHAT = 28
 
 # Bars
-COLOR_INFORMATION_BAR = 43
-COLOR_TOPIC_BAR = 43
-COLOR_PRIVATE_ROOM_BAR = 29
-COLOR_SCROLLABLE_NUMBER = 40
+COLOR_INFORMATION_BAR = 42
+COLOR_TOPIC_BAR = 42
+COLOR_PRIVATE_ROOM_BAR = 28
+COLOR_SCROLLABLE_NUMBER = 39
 
 # Strings for special messages (like join, quit, nick change, etc)
 
@@ -88,16 +88,16 @@ CHAR_JOIN = '---->'
 CHAR_QUIT = '<----'
 CHAR_KICK = '-!-'
 
-COLOR_JOIN_CHAR = 5
-COLOR_QUIT_CHAR = 2
-COLOR_KICK_CHAR = 2
+COLOR_JOIN_CHAR = 4
+COLOR_QUIT_CHAR = 1
+COLOR_KICK_CHAR = 1
 
 # words between ()
-COLOR_CURLYBRACKETED_WORD = 5
+COLOR_CURLYBRACKETED_WORD = 4
 # words between {}
-COLOR_ACCOLADE_WORD = 7
+COLOR_ACCOLADE_WORD = 6
 # words between []
-COLOR_BRACKETED_WORD = 4
+COLOR_BRACKETED_WORD = 3
 
 def init_colors():
     """
@@ -108,7 +108,7 @@ def init_colors():
     """
     curses.start_color()
     curses.use_default_colors()
-    cpt = 1
+    cpt = 0
     for i in range(-1, 7):
         for y in range(0, 8):
             if y == i: