theme chosen

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index d31533b029f6dbfe579a71cd0f024e8a24e55e5d..84aff931b5318c2321d43d7c095acccf9b0368b8 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -794,14 +794,20 @@ def theme():
         # Change theme
         try:
             # Load new config
         # Change theme
         try:
             # Load new config

-            new_config = 'rainbowstream/colorset/' + g['stuff'] + '.json'
+            c['theme'] = g['stuff']
+            if g['stuff'] != 'custom':
+                new_config = 'rainbowstream/colorset/' + g['stuff'] + '.json'
+            else:
+                new_config = os.environ.get(
+                    'HOME',os.environ.get(
+                        'USERPROFILE',
+                        '')) + os.sep + '.rainbow_config.json'

             new_config = load_config(new_config)
             if new_config:
                 for nc in new_config:
                     c[nc] = new_config[nc]
             # Update db and reset colors
             db.theme_update(g['stuff'])
             new_config = load_config(new_config)
             if new_config:
                 for nc in new_config:
                     c[nc] = new_config[nc]
             # Update db and reset colors
             db.theme_update(g['stuff'])

-            cyc = init_cycle()

             g['decorated_name'] = color_func(
                 c['DECORATED_NAME'])(
                 '[@' + g['original_name'] + ']: ')
             g['decorated_name'] = color_func(
                 c['DECORATED_NAME'])(
                 '[@' + g['original_name'] + ']: ')