diff --git a/TODO.org b/TODO.org
index 7af7a04..a54c291 100644
--- a/TODO.org
+++ b/TODO.org
@@ -1,9 +1,8 @@
 #+TITLE: "i3-colors Project Todo List"
 #+AUTHOR: "Loic Guegan"
 
-- Refactoring [0/3]:
-  - [ ] Change src/parser.py name
-  - [ ] Change src/theme.py name
+- Refactoring [1/3]:
+  - [X] Change src/parser.py name => now config.py
   - [ ] Improve function/variables names
 
 - YAML Theme Parser [0/2]:
diff --git a/src/parser.py b/src/config.py
similarity index 100%
rename from src/parser.py
rename to src/config.py
diff --git a/src/i3-theme.py b/src/i3-theme.py
index fa31b1d..1e367b5 100755
--- a/src/i3-theme.py
+++ b/src/i3-theme.py
@@ -1,9 +1,13 @@
 #!/usr/bin/python 
-import parser, theme, os, argparse, subprocess
+import config, theme, os, argparse, subprocess
 
 
 ##### Utils Functions #####
-def log(title, content): print("\033[92m{}\033[00m: {}" .format(title,content))
+def log(msg,title=""):
+    if len(title)>0:
+        print("\033[92m{}\033[00m: {}" .format(title,msg))
+    else:
+        print(msg)
 ###########################
 
 
@@ -18,8 +22,8 @@ args = args_parser.parse_args()
 ##### Apply Theme #####
 loaded_theme=theme.load(args.theme_path)
 for meta_key,meta_value in loaded_theme["meta"].items():
-    log(meta_key.title(),meta_value)
-parser.apply_theme(os.environ["HOME"]+"/.config/i3/config",loaded_theme)
+    log(meta_value,title=meta_key.title())
+config.apply_theme(os.environ["HOME"]+"/.config/i3/config",loaded_theme)
 if args.restart:
     subprocess.Popen("i3-msg restart".split()) 
 #######################
diff --git a/src/theme.py b/src/theme.py
index 187b8d2..d83b6b5 100644
--- a/src/theme.py
+++ b/src/theme.py
@@ -1,6 +1,5 @@
 import yaml,re
 
-
 def configure(theme):
     if "colors" in theme:
         colors=theme["colors"]