diff --git a/files/.config/terminator/config b/files/.config/terminator/config
index 1658c8a..8baffbf 100644
--- a/files/.config/terminator/config
+++ b/files/.config/terminator/config
@@ -9,6 +9,10 @@
 [keybindings]
   close_term = None
   close_window = None
+  go_down = None
+  go_left = None
+  go_right = None
+  go_up = None
   help = None
   layout_launcher = None
   next_profile = None
@@ -27,8 +31,8 @@
     background_image = None
     background_type = transparent
     cursor_color = "#fffeab"
-    custom_command = TERM='xterm-256color' bash -l
-    font = Monospace 8
+    custom_command = TERM='xterm-256color' $SHELL -l
+    font = DejaVu Sans Mono 9
     foreground_color = "#faffb4"
     scrollbar_position = hidden
     show_titlebar = False
@@ -56,10 +60,26 @@
     palette = "#2e3436:#cc0000:#4e9a06:#ca5307:#3465a4:#75507b:#06989a:#d3d7cf:#555753:#ef2929:#8ae234:#ff751d:#657689:#ad7fa8:#34e2e2:#eeeeec"
     scrollbar_position = hidden
     show_titlebar = False
+<<<<<<< HEAD
   [[vsmall_font]]
     background_image = None
+=======
+    use_system_font = False
+  [[projection_black]]
+    cursor_color = "#aaaaaa"
+    font = Inconsolata 20
+    foreground_color = "#ffffff"
+    scrollbar_position = hidden
+    use_system_font = False
+  [[vsmall_font]]
+    cursor_color = "#ffffff"
+>>>>>>> 387b182... Terminator: cosmetic changes
     font = Sans 6
     foreground_color = "#ffffff"
     use_system_font = False
   [[with_titlebar]]
+<<<<<<< HEAD
     background_image = None
+=======
+    cursor_color = "#aaaaaa"
+>>>>>>> 387b182... Terminator: cosmetic changes