diff --git a/emacs/.spacemacs b/emacs/.spacemacs
index b0a3fd5..9c20213 100644
--- a/emacs/.spacemacs
+++ b/emacs/.spacemacs
@@ -55,10 +55,11 @@ This function should only modify configuration layer settings."
      ;; spell-checking
      syntax-checking
      ;; version-control
-     ;;(cmake :variables cmake-enable-cmake-ide-support 't)
+     (cmake :variables cmake-enable-cmake-ide-support 't)
      (c-c++ :variables
             c-c++-enable-clang-support 't
-            c-c++-default-mode-for-headers 'c++-mode)
+            c-c++-default-mode-for-headers 'c++-mode
+            c-c++ :variables c-c++-backend 'rtags)
      java
      shell-scripts
      spacemacs-layouts
@@ -457,7 +458,7 @@ This function is called immediately after `dotspacemacs/init', before layer
 configuration.
 It is mostly for variables that should be set before packages are loaded.
 If you are unsure, try setting them in `dotspacemacs/user-config' first."
-  )
+  (setq-default git-magit-status-fullscreen t))
 
 (defun dotspacemacs/user-load ()
   "Library to load while dumping.
@@ -499,19 +500,6 @@ before packages are loaded."
     (setq magit-repository-directories
           '(("/home/coolneng/Documents/Uni" . 6)))
     (add-to-list 'auto-mode-alist '("\\.aiml\\'" . web-mode))
-    (defun display-new-buffer (buffer force-other-window) ; Vertical/horizontal split based on the screen space
-      (or (get-buffer-window buffer)
-        (if (one-window-p)
-            (let ((new-win
-                  (if (> (window-width) 100)
-                      (split-window-horizontally)
-                    (split-window-vertically))))
-              (set-window-buffer new-win buffer)
-              new-win)
-          (let ((new-win (get-lru-window)))
-            (set-window-buffer new-win buffer)
-            new-win))))
-    (setq display-buffer-function 'display-new-buffer)
   )
 
 ;; Do not write anything past this comment. This is where Emacs will
@@ -532,7 +520,7 @@ This function is called at the very end of Spacemacs initialization."
  '(hl-paren-colors (quote ("#40883f" "#0287c8" "#b85c57")))
  '(package-selected-packages
    (quote
-    (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)))
+    (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")