diff --git a/flake.nix b/flake.nix
index b05629e..78fc90a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,7 +32,7 @@
     };
   };
 
-  outputs = { 
+  outputs = {
     nixpkgs,
     nixpkgs-unstable,
     flake-parts,
@@ -44,7 +44,7 @@
     nixpak,
     ...
   } @ inputs: let
-    lib = nixpkgs.lib.extend (final: prev: 
+    lib = nixpkgs.lib.extend (final: prev:
       import ./lib { lib = final; }
     );
   in {
diff --git a/modules/home/caem/desktop/gnome/default.nix b/modules/home/caem/desktop/gnome/default.nix
index 1934357..09f7734 100644
--- a/modules/home/caem/desktop/gnome/default.nix
+++ b/modules/home/caem/desktop/gnome/default.nix
@@ -2,7 +2,7 @@
 
 let
   picture-uri = if builtins.hasAttr "wallpaper" inputs.secrets.paths
-                  then builtins.toString inputs.secrets.paths.wallpaper 
+                  then builtins.toString inputs.secrets.paths.wallpaper
                   else builtins.toString ../../../../../assets/wallpaper.jpg;
 in {
   gtk = {
diff --git a/modules/home/caem/development/emacs/emacs.d/annoyances.el b/modules/home/caem/development/emacs/emacs.d/annoyances.el
index ac8f18f..28d2b3c 100644
--- a/modules/home/caem/development/emacs/emacs.d/annoyances.el
+++ b/modules/home/caem/development/emacs/emacs.d/annoyances.el
@@ -6,3 +6,4 @@
 	backup-by-copying t))
 
 (setq inhibit-startup-message t)
+(setq auto-save-default nil)
diff --git a/modules/home/caem/development/emacs/emacs.d/appearance.el b/modules/home/caem/development/emacs/emacs.d/appearance.el
index 20ed116..95235f5 100644
--- a/modules/home/caem/development/emacs/emacs.d/appearance.el
+++ b/modules/home/caem/development/emacs/emacs.d/appearance.el
@@ -11,10 +11,8 @@
 	     '(font . "Go Mono Nerd Font-12"))
 
 ;; Temporary theme. Replace later.
-(use-package doom-themes
+(use-package darktooth-theme
   :ensure t
   :config
-  (setq doom-themes-enable-bold t
-        doom-themes-enable-italic t)
-  (doom-themes-org-config)
-  (load-theme 'doom-sourcerer t))
+  (load-theme 'darktooth-dark t)
+  (set-face-background 'hl-line "#262626")) ;; darktooth-background-0
diff --git a/modules/home/caem/development/emacs/emacs.d/formatting.el b/modules/home/caem/development/emacs/emacs.d/formatting.el
new file mode 100644
index 0000000..02f9ccd
--- /dev/null
+++ b/modules/home/caem/development/emacs/emacs.d/formatting.el
@@ -0,0 +1,15 @@
+(setq-default indent-tabs-mode nil)
+(setq-default tab-width 4)
+(setq indent-line-function 'insert-tab)
+(setq-default show-trailing-whitespace t)
+
+(use-package indent-bars
+  :ensure t
+  :hook (prog-mode . indent-bars-mode)
+  :custom
+  (indent-bars-display-on-blank-lines t)
+  (indent-bars-pattern " . . . ")
+  (indent-bars-color '("#7C6F64" :blend 0.2))
+  (indent-bars-width-frac 0.15)
+  (indent-bars-color-by-depth nil)
+  (indent-bars-highlight-current-depth '(:color "#DD6F48" :pattern "." :blend 0.4)))
diff --git a/modules/home/caem/development/emacs/emacs.d/init.el b/modules/home/caem/development/emacs/emacs.d/init.el
index 4558ee2..0929330 100644
--- a/modules/home/caem/development/emacs/emacs.d/init.el
+++ b/modules/home/caem/development/emacs/emacs.d/init.el
@@ -23,5 +23,5 @@
 (load (expand-file-name "./appearance.el" conf-home))
 (load (expand-file-name "./annoyances.el" conf-home))
 (load (expand-file-name "./completions.el" conf-home))
-(load (expand-file-name "./languages.el" conf-home))
-
+(load (expand-file-name "./formatting.el" conf-home))
+(mapc 'load (file-expand-wildcards (expand-file-name "./languages/*.el" conf-home)))
diff --git a/modules/home/caem/development/emacs/emacs.d/languages.el b/modules/home/caem/development/emacs/emacs.d/languages.el
deleted file mode 100644
index 4eac102..0000000
--- a/modules/home/caem/development/emacs/emacs.d/languages.el
+++ /dev/null
@@ -1 +0,0 @@
-(mapc 'load (file-expand-wildcards (expand-file-name "./languages/*.el" conf-home)))
diff --git a/modules/home/caem/development/emacs/emacs.d/languages/nix.el b/modules/home/caem/development/emacs/emacs.d/languages/nix.el
index 6b2e2ea..13528c6 100644
--- a/modules/home/caem/development/emacs/emacs.d/languages/nix.el
+++ b/modules/home/caem/development/emacs/emacs.d/languages/nix.el
@@ -5,3 +5,7 @@
 (use-package pretty-sha-path
   :ensure t
   :config (global-pretty-sha-path-mode 1))
+
+(add-hook 'nix-mode-hook
+	  (lambda ()
+	    (setq tab-width 2)))