diff --git a/emacs/.spacemacs b/emacs/.spacemacs
index 121238e..e65fb32 100644
--- a/emacs/.spacemacs
+++ b/emacs/.spacemacs
@@ -55,7 +55,10 @@ This function should only modify configuration layer settings."
              shell-default-shell 'eshell)
      ;; spell-checking
      syntax-checking
-     ;; version-control
+     (version-control :variables
+                       version-control-diff-tool 'diff-hl
+                       version-control-diff-side 'left
+                       version-control-global-margin t)
      (cmake :variables
             cmake-enable-cmake-ide-support t
             cmake-compile-command "cmake -H. -BDebug -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=YES; ln -s Debug/compile_commands.json .; cmake .")
@@ -526,7 +529,7 @@ This function is called at the very end of Spacemacs initialization."
  '(hl-paren-colors (quote ("#40883f" "#0287c8" "#b85c57")))
  '(package-selected-packages
    (quote
-    (lsp-python-ms python cpp-auto-include pretty-symbols blacken test-simple loc-changes load-relative dap-mode bui tree-mode lsp-ui lsp-treemacs treemacs pfuture ace-window avy lsp-java request helm-lsp cquery company-lsp ccls lsp-mode spinner ht dash-functional yasnippet yapfify pytest pyenv-mode py-isort pippel pipenv pyvenv pip-requirements live-py-mode importmagic epc ctable concurrent deferred cython-mode company-anaconda anaconda-mode pythonic flycheck-package package-lint counsel-projectile projectile levenshtein lv rtags web-mode web-beautify tagedit slim-mode scss-mode sass-mode pug-mode prettier-js impatient-mode htmlize simple-httpd haml-mode emmet-mode counsel-css company-web web-completion-data smeargle magit-svn magit-gitflow magit-popup gitignore-templates gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link evil-magit magit transient git-commit with-editor dash hasklig-mode yasnippet-snippets ivy-hydra counsel swiper helm helm-core ivy flycheck company hydra zerodark-theme xterm-color winum which-key wgrep use-package smex smartparens shell-pop realgud plan9-theme persp-mode pcre2el overseer nameless mvn multi-term mmm-mode meghanada maven-test-mode markdown-toc macrostep ivy-yasnippet ivy-xref ivy-rtags insert-shebang ibuffer-projectile helm-make groovy-mode groovy-imports gradle-mode google-c-style gh-md fuzzy flycheck-rtags flycheck-pos-tip flycheck-irony flycheck-bashate flx fish-mode eyebrowse evil eshell-z eshell-prompt-extras esh-help ensime elisp-slime-nav dotenv-mode disaster diminish company-statistics company-shell company-rtags company-irony-c-headers company-irony company-emacs-eclim company-c-headers cmake-mode cmake-ide clang-format bind-map auto-yasnippet auto-compile async ac-ispell)))
+    (git-gutter-fringe+ git-gutter-fringe fringe-helper git-gutter+ git-gutter diff-hl browse-at-remote lsp-python-ms python cpp-auto-include pretty-symbols blacken test-simple loc-changes load-relative dap-mode bui tree-mode lsp-ui lsp-treemacs treemacs pfuture ace-window avy lsp-java request helm-lsp cquery company-lsp ccls lsp-mode spinner ht dash-functional yasnippet yapfify pytest pyenv-mode py-isort pippel pipenv pyvenv pip-requirements live-py-mode importmagic epc ctable concurrent deferred cython-mode company-anaconda anaconda-mode pythonic flycheck-package package-lint counsel-projectile projectile levenshtein lv rtags web-mode web-beautify tagedit slim-mode scss-mode sass-mode pug-mode prettier-js impatient-mode htmlize simple-httpd haml-mode emmet-mode counsel-css company-web web-completion-data smeargle magit-svn magit-gitflow magit-popup gitignore-templates gitignore-mode gitconfig-mode gitattributes-mode git-timemachine git-messenger git-link evil-magit magit transient git-commit with-editor dash hasklig-mode yasnippet-snippets ivy-hydra counsel swiper helm helm-core ivy flycheck company hydra zerodark-theme xterm-color winum which-key wgrep use-package smex smartparens shell-pop realgud plan9-theme persp-mode pcre2el overseer nameless mvn multi-term mmm-mode meghanada maven-test-mode markdown-toc macrostep ivy-yasnippet ivy-xref ivy-rtags insert-shebang ibuffer-projectile helm-make groovy-mode groovy-imports gradle-mode google-c-style gh-md fuzzy flycheck-rtags flycheck-pos-tip flycheck-irony flycheck-bashate flx fish-mode eyebrowse evil eshell-z eshell-prompt-extras esh-help ensime elisp-slime-nav dotenv-mode disaster diminish company-statistics company-shell company-rtags company-irony-c-headers company-irony company-emacs-eclim company-c-headers cmake-mode cmake-ide clang-format bind-map auto-yasnippet auto-compile async ac-ispell)))
  '(safe-local-variable-values (quote ((eval progn (pp-buffer) (indent-buffer)))))
  '(sml/active-background-color "#98ece8")
  '(sml/active-foreground-color "#424242")