only have 64 colours, so everything works fine on every terminal, even on tmux. Fixed #1824

2 files changed, 69 insertions, 65 deletions

diff --git a/data/themes/dark b/data/themes/dark
index d2c77339..2acaa966 100644
--- a/data/themes/dark
+++ b/data/themes/dark
@@ -3,54 +3,56 @@
 
 
 # Message text color
-COLOR_NORMAL_TEXT = 80
-COLOR_INFORMATION_TEXT = 76
-COLOR_HIGHLIGHT_TEXT = 79
+COLOR_NORMAL_TEXT = 0
+COLOR_INFORMATION_TEXT = 6
+COLOR_HIGHLIGHT_TEXT = 4
 
 # User list color
-COLOR_USER_VISITOR = 78
-COLOR_USER_PARTICIPANT = 73
-COLOR_USER_NONE = 80
-COLOR_USER_MODERATOR = 77
+COLOR_USER_VISITOR = 8
+COLOR_USER_PARTICIPANT = 5
+COLOR_USER_NONE = 1
+COLOR_USER_MODERATOR = 2
 
 # The character printed in color (COLOR_STATUS_*) before the nickname
 # in the user list
 CHAR_STATUS = '|'
 
 # Separators
-COLOR_VERTICAL_SEPARATOR = 72
-COLOR_NEW_TEXT_SEPARATOR = 75
+COLOR_VERTICAL_SEPARATOR = 1
+COLOR_NEW_TEXT_SEPARATOR = 4
 
 # Time
-COLOR_TIME_SEPARATOR = 79
-COLOR_TIME_BRACKETS = 72
+COLOR_TIME_SEPARATOR = 7
+COLOR_TIME_LIMITER = 0
+CHAR_TIME_LEFT = ''
+CHAR_TIME_RIGHT = ''
 COLOR_TIME_NUMBERS = 0
 
 # Tabs
-COLOR_TAB_NORMAL = 8
-COLOR_TAB_CURRENT = 0
-COLOR_TAB_NEW_MESSAGE = 7
-COLOR_TAB_HIGHLIGHT = 5
-COLOR_TAB_PRIVATE = 3
+COLOR_TAB_NORMAL = 58
+COLOR_TAB_CURRENT = 8
+COLOR_TAB_NEW_MESSAGE = 11
+COLOR_TAB_HIGHLIGHT = 9
+COLOR_TAB_PRIVATE = 10
 
 # Nickname colors
 LIST_COLOR_NICKNAMES = [
-    73, 74, 75, 76, 77, 79
+    2, 3, 4, 5, 6, 7
     ]
-COLOR_OWN_NICK = 80
+COLOR_OWN_NICK = 8
 
 # Status color
-COLOR_STATUS_XA = 76
-COLOR_STATUS_NONE = 73
-COLOR_STATUS_DND = 77
-COLOR_STATUS_AWAY = 79
-COLOR_STATUS_CHAT = 75
+COLOR_STATUS_XA = 6
+COLOR_STATUS_NONE = 5
+COLOR_STATUS_DND = 2
+COLOR_STATUS_AWAY = 4
+COLOR_STATUS_CHAT = 3
 
 # Bars
-COLOR_INFORMATION_BAR = 8
-COLOR_TOPIC_BAR = 8
-COLOR_PRIVATE_ROOM_BAR = 3
-COLOR_SCROLLABLE_NUMBER = 75
+COLOR_INFORMATION_BAR = 58
+COLOR_TOPIC_BAR = 15
+COLOR_PRIVATE_ROOM_BAR = 10
+COLOR_SCROLLABLE_NUMBER = 11
 
 # Strings for special messages (like join, quit, nick change, etc)
 
@@ -59,13 +61,13 @@ CHAR_JOIN = '---->'
 CHAR_QUIT = '<----'
 CHAR_KICK = '-!-'
 
-COLOR_JOIN_CHAR = 73
-COLOR_QUIT_CHAR = 77
-COLOR_KICK_CHAR = 77
+COLOR_JOIN_CHAR = 5
+COLOR_QUIT_CHAR = 2
+COLOR_KICK_CHAR = 2
 
 # words between ()
-COLOR_CURLYBRACKETED_WORD = 72
+COLOR_CURLYBRACKETED_WORD = 5
 # words between {}
-COLOR_ACCOLADE_WORD = 74
+COLOR_ACCOLADE_WORD = 7
 # words between []
-COLOR_BRACKETED_WORD = 79
\ No newline at end of file
+COLOR_BRACKETED_WORD = 4
\ No newline at end of file
diff --git a/data/themes/poezio b/data/themes/poezio
index 7adaa85d..a456d5f1 100644
--- a/data/themes/poezio
+++ b/data/themes/poezio
@@ -3,53 +3,55 @@
 
 # Message text color
 COLOR_NORMAL_TEXT = 0
-COLOR_INFORMATION_TEXT = 76
-COLOR_HIGHLIGHT_TEXT = 77
+COLOR_INFORMATION_TEXT = 6
+COLOR_HIGHLIGHT_TEXT = 2
 
 # User list color
-COLOR_USER_VISITOR = 78
-COLOR_USER_PARTICIPANT = 73
-COLOR_USER_NONE = 80
-COLOR_USER_MODERATOR = 77
+COLOR_USER_VISITOR = 8
+COLOR_USER_PARTICIPANT = 5
+COLOR_USER_NONE = 1
+COLOR_USER_MODERATOR = 2
 
 # The character printed in color (COLOR_STATUS_*) before the nickname
 # in the user list
 CHAR_STATUS = ' '
 
 # Separators
-COLOR_VERTICAL_SEPARATOR = 73
-COLOR_NEW_TEXT_SEPARATOR = 75
+COLOR_VERTICAL_SEPARATOR = 5
+COLOR_NEW_TEXT_SEPARATOR = 3
 
 # Time
-COLOR_TIME_SEPARATOR = 79
-COLOR_TIME_BRACKETS = 74
+COLOR_TIME_SEPARATOR = 7
+COLOR_TIME_LIMITER = 0
+CHAR_TIME_LEFT = ''
+CHAR_TIME_RIGHT = ''
 COLOR_TIME_NUMBERS = 0
 
 # Tabs
-COLOR_TAB_NORMAL = 15
-COLOR_TAB_CURRENT = 24
-COLOR_TAB_NEW_MESSAGE = 42
-COLOR_TAB_HIGHLIGHT = 51
-COLOR_TAB_PRIVATE = 33
+COLOR_TAB_NORMAL = 43
+COLOR_TAB_CURRENT = 57
+COLOR_TAB_NEW_MESSAGE = 50
+COLOR_TAB_HIGHLIGHT = 22
+COLOR_TAB_PRIVATE = 29
 
 # Nickname colors
 LIST_COLOR_NICKNAMES = [
-    73, 74, 75, 76, 77, 79
+    2, 3, 4, 5, 6, 7
     ]
-COLOR_OWN_NICK = 78
+COLOR_OWN_NICK = 8
 
 # Status color
-COLOR_STATUS_XA = 40
-COLOR_STATUS_NONE = 72
-COLOR_STATUS_DND = 50
-COLOR_STATUS_AWAY = 70
-COLOR_STATUS_CHAT = 30
+COLOR_STATUS_XA = 50
+COLOR_STATUS_NONE = 0
+COLOR_STATUS_DND = 22
+COLOR_STATUS_AWAY = 36
+COLOR_STATUS_CHAT = 29
 
 # Bars
-COLOR_INFORMATION_BAR = 15
-COLOR_TOPIC_BAR = 15
-COLOR_PRIVATE_ROOM_BAR = 33
-COLOR_SCROLLABLE_NUMBER = 16
+COLOR_INFORMATION_BAR = 43
+COLOR_TOPIC_BAR = 43
+COLOR_PRIVATE_ROOM_BAR = 29
+COLOR_SCROLLABLE_NUMBER = 40
 
 # Strings for special messages (like join, quit, nick change, etc)
 
@@ -58,13 +60,13 @@ CHAR_JOIN = '---->'
 CHAR_QUIT = '<----'
 CHAR_KICK = '-!-'
 
-COLOR_JOIN_CHAR = 73
-COLOR_QUIT_CHAR = 77
-COLOR_KICK_CHAR = 77
+COLOR_JOIN_CHAR = 5
+COLOR_QUIT_CHAR = 2
+COLOR_KICK_CHAR = 2
 
 # words between ()
-COLOR_CURLYBRACKETED_WORD = 72
+COLOR_CURLYBRACKETED_WORD = 5
 # words between {}
-COLOR_ACCOLADE_WORD = 74
+COLOR_ACCOLADE_WORD = 7
 # words between []
-COLOR_BRACKETED_WORD = 73
+COLOR_BRACKETED_WORD = 4