diff --git a/core/core-evil.el b/core/core-evil.el
index 88d644418..082a5fa51 100644
--- a/core/core-evil.el
+++ b/core/core-evil.el
@@ -5,7 +5,7 @@
   :init
   ;; Speed up show-paren outside of normal mode (where my motions are minimal)
   (add-hook! evil-normal-state-entry (setq show-paren-delay 0.075))
-  (add-hook! evil-normal-state-exit (setq show-paren-delay 0))
+  (add-hook! evil-normal-state-exit  (setq show-paren-delay 0))
   ;; Disable highlights on insert-mode
   (add-hook! evil-insert-state-entry 'evil-ex-nohighlight)
   ;; Prevents "matches )" messages in minibuffer
diff --git a/core/core-flycheck.el b/core/core-flycheck.el
index 6b82e5001..73746cf4b 100644
--- a/core/core-flycheck.el
+++ b/core/core-flycheck.el
@@ -5,7 +5,7 @@
   :functions (flycheck-buffer)
   :commands (flycheck-mode flycheck-list-errors)
   :init
-  (setq flycheck-indication-mode 'right-fringe
+  (setq flycheck-indication-mode nil
         ;; Removed checks on idle/change for snappiness
         flycheck-check-syntax-automatically '(save mode-enabled idle-change)
         flycheck-disabled-checkers '(emacs-lisp-checkdoc make))
diff --git a/core/core-ui.el b/core/core-ui.el
index 6973e2670..58b72590c 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -26,6 +26,8 @@
  ;; switching.
  cursor-in-non-selected-windows  nil
 
+ uniquify-buffer-name-style      nil
+
  visible-bell                    nil    ; silence of the bells
  use-dialog-box                  nil    ; avoid GUI
  redisplay-dont-pause            t
@@ -258,7 +260,6 @@
       process :when active)
      (global :when active)
      (narf-line-column narf-buffer-position)
-     ;; narf-hud
      )))
 
 (provide 'core-ui)
diff --git a/core/core-workgroups.el b/core/core-workgroups.el
index 6ca781441..6a5bd2e5c 100644
--- a/core/core-workgroups.el
+++ b/core/core-workgroups.el
@@ -13,6 +13,7 @@
         ;; What to do on Emacs exit / workgroups-mode exit?
         wg-emacs-exit-save-behavior           'save       ; Options: 'save 'ask nil
         wg-workgroups-mode-exit-save-behavior 'save
+        wg-log-level 0
 
         wg-list-display-decor-divider         " : "
         wg-list-display-decor-current-left    "["
diff --git a/modules/module-csharp.el b/modules/module-csharp.el
index 736746161..e1355718d 100644
--- a/modules/module-csharp.el
+++ b/modules/module-csharp.el
@@ -6,7 +6,7 @@
   :init (add-hook! csharp-mode 'flycheck-mode))
 
 ;; unity shaders
-(use-package shaderlab-mode :mode "\\.shader$")
+(use-package shader-mode :mode "\\.shader$")
 
 (use-package omnisharp
   :after csharp-mode