diff --git a/spacemacs b/spacemacs
index d21a2ef..f8fa41c 100644
--- a/spacemacs
+++ b/spacemacs
@@ -6,31 +6,36 @@
   "Configuration Layers declaration."
   (setq ttm-layers
         '(
-          ;; ----------------------------------------------------------------
-          ;; Example of useful layers you may want to use right away.
-          ;; Uncomment some layer names and press <SPC f e R> (Vim style) or
-          ;; <M-m f e R> (Emacs style) to install them.
-          ;; ----------------------------------------------------------------
-          auto-completion
-          ;; better-defaults
+          ;; Emacs general
+          spacemacs-layouts
+          eyebrowse
+
+          ;; Languages
           clojure
-          csharp
-          (colors :variables
-                  colors-enable-rainbow-identifiers t)
           emacs-lisp
-          git
-          ;; markdown
-          org
-          (shell :variables
-                 shell-default-term-shell "/usr/local/bin/fish")
-          shell-scripts
+          csharp
           ruby
           php
           python
           html
-          ;; syntax-checking
-          themes-megapack
+          markdown
+          org
+          shell-scripts ;; For fish syntax hilighting
+
+          ;; External tool integration
           version-control
+          git
+          (shell :variables
+                 shell-default-term-shell "/usr/local/bin/fish")
+
+          ;; Editing
+          auto-completion
+          ;; syntax-checking
+
+          ;; Aesthetics
+          (colors :variables
+                  colors-enable-rainbow-identifiers t)
+          themes-megapack
           ))
 
   ;; Enable osx layer only on Macs