diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index b160a93..4624a67 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -383,7 +383,7 @@
     (self-insert-command arg)
     (set-marker m2 (point))
     (forward-char 1)
-    (c-backward-token-1 1 t)
+    (c-backward-token-2 1 t)
     (set-marker m1 (point))
     (goto-char m2)
     (indent-region m1 m2 nil)))
@@ -975,17 +975,19 @@
 ;; ================================================================
 ;; TRAMP
 ;; ================================================================
-(require 'tramp)
-;; Since we're going to be doing this a lot, the minibar message
-;; tramp spits out for every file access is both spammy, distracting,
-;; and often hides more relevant messages.
-(setq tramp-message-show-message nil)
-;; Let tramp search $PATH as given to the $USER on the remote machine
-;; (necessary to find 'hphpd' for instance)
-(add-to-list 'tramp-remote-path 'tramp-own-remote-path)
-;; Use putty on windows
-(when (eq window-system 'w32)
-  (setq tramp-default-method "plink"))
+(use-package tramp
+  :config
+  ;; Since we're going to be doing this a lot, the minibar message tramp
+  ;; spits out for every file access is both spammy, distracting, and often
+  ;; hides more relevant messages.
+  (setq tramp-message-show-message nil)
+  ;; Let tramp search $PATH as given to the $USER on the remote machine
+  ;; (necessary to find 'hphpd' for instance)
+  (add-to-list 'tramp-remote-path 'tramp-own-remote-path)
+  ;; Use putty on windows
+  (when (eq window-system 'w32)
+    (setq tramp-default-method "plink")))
+
 
 ;; ================================================================
 ;; Zig