diff --git a/config/theme.vim b/config/theme.vim
index a21444e..a146c13 100644
--- a/config/theme.vim
+++ b/config/theme.vim
@@ -11,11 +11,11 @@ source $VIMHOME/config/themes/miramare.vim
 function! LightOrDarkness()
     if &background==?"dark"
         set background=light
-        colorscheme edge
+        colorscheme gitgo
         hi Search guibg=Green
     elseif &background==?"light"
         set background=dark
-        colorscheme g:colorscheme
+        execute 'colorscheme ' . g:colorscheme
         hi Search guibg=Purple
     endif
 endfunction
diff --git a/config/themes/melange.vim b/config/themes/melange.vim
index 2d2816b..dfd63be 100644
--- a/config/themes/melange.vim
+++ b/config/themes/melange.vim
@@ -1,4 +1,4 @@
 " Melange configuration
 
 colorscheme melange
-let g:colorscheme = melange
+let g:colorscheme = 'melange'
diff --git a/config/themes/miramare.vim b/config/themes/miramare.vim
index ab46168..8929c6d 100644
--- a/config/themes/miramare.vim
+++ b/config/themes/miramare.vim
@@ -10,4 +10,4 @@ set number
 let g:enable_bold_font = 1
 let g:enable_italic_font = 1
 set laststatus=2
-let g:colorscheme = miramare
+let g:colorscheme = 'miramare'