diff --git a/lisp/keybinds.el b/lisp/keybinds.el
index 7d21e5e..1925ee9 100644
--- a/lisp/keybinds.el
+++ b/lisp/keybinds.el
@@ -9,37 +9,38 @@
 ;;; Code:
 
 ;; Files
-(general-create-definer diancite/file
-  :prefix leader-key)
-
-(diancite/file
- :keymaps 'normal
- "f f" '(find-file :wk "Find File")
- "f s" '(save-buffer :wk "Save Buffer"))
-
-;; Magit
-(general-create-definer diancite/magit
-  :prefix leader-key)
-
-(diancite/magit
- :keymaps 'normal
- "m s" '(magit-status :wk "Status")
- "m d" '(magit-dispatch :wk "Dispatch")
- "m f" '(magit-file-dispatch :wk "File Dispatch"))
-
-;; Flymake & LSP
-(general-create-definer diancite/lsp
-  :prefix leader-key)
-
-(diancite/lsp
- :keymaps 'normal
- "l" '(:wk "LSP")
- "l n" '(flycheck-next-error :wk "Next Error")
- "l p" '(flycheck-previous-error :wk "Previous Error")
- "l f" '(eglot-format :wk "Format Buffer")
-
- "l w" '(:wk "Server")
- "l w r" '(eglot-reconnect :wk "Restart Server")
- "l w q" '(eglot-shutdown :wk "Shutdown Server"))
+(with-eval-after-load 'general
+  (general-create-definer diancite/file
+    :prefix leader-key)
+  
+  (diancite/file
+    :keymaps 'normal
+    "f f" '(find-file :wk "Find File")
+    "f s" '(save-buffer :wk "Save Buffer"))
+  
+  ;; Magit
+  (general-create-definer diancite/magit
+    :prefix leader-key)
+  
+  (diancite/magit
+    :keymaps 'normal
+    "m s" '(magit-status :wk "Status")
+    "m d" '(magit-dispatch :wk "Dispatch")
+    "m f" '(magit-file-dispatch :wk "File Dispatch"))
+  
+  ;; Flymake & LSP
+  (general-create-definer diancite/lsp
+    :prefix leader-key)
+  
+  (diancite/lsp
+    :keymaps 'normal
+    "l" '(:wk "LSP")
+    "l n" '(flycheck-next-error :wk "Next Error")
+    "l p" '(flycheck-previous-error :wk "Previous Error")
+    "l f" '(eglot-format :wk "Format Buffer")
+    
+    "l w" '(:wk "Server")
+    "l w r" '(eglot-reconnect :wk "Restart Server")
+    "l w q" '(eglot-shutdown :wk "Shutdown Server")))
 
 ;;; keybinds.el ends here
diff --git a/lisp/languages.el b/lisp/languages.el
index a64a47d..b4e6deb 100644
--- a/lisp/languages.el
+++ b/lisp/languages.el
@@ -12,10 +12,21 @@
 (use-package markdown-mode)
 
 ;; Diagnostics
-(use-package flycheck
+(use-package flycheck-rust
+  :after flycheck
   :init
-  (global-flycheck-mode) ; Enable flycheck everywhere by default
-  (push 'rustic-clippy flycheck-checkers)) ; Use clippy for Rust
+  (add-hook 'flycheck-mode-hook #'flycheck-rust-setup)) ; Enable flycheck-rust where flycheck is enabled. If not a rust file, does nothing.
+  
+(use-package flycheck-inline
+  :after flycheck
+  :hook
+  (flycheck-mode . flycheck-inline-mode)) ; Enable flycheck-inline where flycheck is enabled
+
+(use-package flycheck
+  :hook prog-mode
+  :init
+  (with-eval-after-load 'flycheck
+    (push 'rustic-clippy flycheck-checkers))) ; Use clippy for Rust
 
 ;; eglot - Language Server Protocol ingegration
 (use-package eglot)
@@ -23,19 +34,9 @@
 ;; Go
 (use-package go-mode
   :config
-  (add-hook 'before-save-hook 'gofmt-before-save) ; Format on save
-  :hook
-  (go-mode . flycheck-mode)) ; Enable flycheck-mode by default
+  (add-hook 'before-save-hook 'gofmt-before-save)) ; Format on save
 
 ;; Rust
-(use-package flycheck-rust
-  :init
-  (add-hook 'flycheck-mode-hook #'flycheck-rust-setup)) ; Enable flycheck-rust where flycheck is enabled. If not a rust file, does nothing.
-  
-(use-package flycheck-inline
-  :hook
-  (flycheck-mode . flycheck-inline-mode)) ; Enable flycheck-inline where flycheck is enabled
-
 (use-package rustic
   :custom
   (rustic-format-trigger 'on-save) ; Format buffer on save
diff --git a/lisp/org-mode.el b/lisp/org-mode.el
index 99f3629..a7b24c7 100644
--- a/lisp/org-mode.el
+++ b/lisp/org-mode.el
@@ -9,24 +9,13 @@
 
 ;; org-mode ;; org-superstar
 (use-package org-superstar
+  :after org
   :custom
   ;; Change org-mode's heading bullets
   (org-superstar-headline-bullets-list
    '("🞉" "🞈" "🞇" "🞆" "🞅" "🞄"))
   :hook org-mode)
 
-;; Customize org-mode's default functionality
-(setq org-ellipsis "..."
-      org-use-property-inheritance t
-      org-list-allow-alphabetical t
-      org-catch-invisible-edits 'smart
-      org-startup-indented t
-      org-hide-emphasis-markers t
-      org-startup-with-inline-images t
-      org-image-actual-width '(300)
-      org-pretty-entities t
-      org-adapt-indentation t)
-
 (with-eval-after-load 'org-superstar
   ;; Faces for the font sizes of org-mode headings
   (set-face-attribute 'org-level-8 nil :weight 'bold :inherit 'default)
@@ -43,6 +32,18 @@
                     :inherit 'org-level-8))
 
 (with-eval-after-load 'org
+  ;; Customize org-mode's default functionality
+  (setq org-ellipsis "..."
+	org-use-property-inheritance t
+	org-list-allow-alphabetical t
+	org-catch-invisible-edits 'smart
+	org-startup-indented t
+	org-hide-emphasis-markers t
+	org-startup-with-inline-images t
+	org-image-actual-width '(300)
+	org-pretty-entities t
+	org-adapt-indentation t)
+  
   (plist-put org-format-latex-options :scale 2.5) ; Scale up latex elements
   (setq org-directory "~/Org/") ; Set the folder used by org-mode
   (setq org-agenda-files (quote ("~/Org/")))