-# Load colorset
-default_config = 'rainbowstream/colorset/default.json'
-rainbow_config = os.environ.get('HOME', os.environ.get('USERPROFILE','')) + os.sep + '.rainbow_config.json'
-load_config(default_config)
-load_config(rainbow_config)
+# Config dictionary
+c = {}
+
+# Load user's config
+rainbow_config = os.environ.get(
+ 'HOME',
+ os.environ.get(
+ 'USERPROFILE',
+ '')) + os.sep + '.rainbow_config.json'
+try:
+ data = load_config(rainbow_config)
+ for d in data:
+ c[d] = data[d]
+except:
+ pass
+
+# Load default theme
+theme_file = os.path.dirname(
+ __file__) + '/colorset/' + c['THEME'] + '.json'
+try:
+ data = load_config(theme_file)
+ for d in data:
+ c[d] = data[d]
+except:
+ pass