diff --git a/init.el b/init.el
index f28b8dc..b9bab59 100644
--- a/init.el
+++ b/init.el
@@ -110,9 +110,6 @@
 ;;   :hook
 ;;   (irony-mode . #'irony-eldoc))
 
-;; ;; Syntax checker
-;; (unless slow-computer
-;;   (use-package flycheck))
 ;; (use-package flycheck-irony
 ;;   :after (flycheck irony)
 ;;   :config
@@ -120,11 +117,6 @@
 ;;   (eval-after-load 'flycheck
 ;;     '(add-hook 'flycheck-mode-hook #'flycheck-irony-setup)))
 
-;; ;; Autocomplete
-;; (unless slow-computer
-;;   (use-package company
-;;     :hook
-;;     (after-init . global-company-mode)))
 ;; (use-package company-irony
 ;;   :after (company irony)
 ;;   :config
@@ -156,8 +148,6 @@
     (c-mode     . (rtags-start-process-unless-running))
     (kill-emacs . rtags-quit-rdm)))
 
-(unless slow-computer
-  (use-package flycheck))
 (use-package flycheck-rtags
   :after (flycheck rtags)
   :defer nil
@@ -172,10 +162,6 @@
   (c-mode-hook   . #'setup-flycheck-rtags)
   (c++-mode-hook . #'setup-flycheck-rtags))
 
-(unless slow-computer
-  (use-package company
-    :hook
-    (after-init . global-company-mode)))
 (use-package company-rtags
   :after (company rtags)
   :config
@@ -184,13 +170,23 @@
   (setq rtags-completions-enabled t)
   (push 'company-rtags company-backends))
 
+;;;;;;;;;;;;;;;;;;;; Programming / other ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Syntax checking
+(unless slow-computer
+  (use-package flycheck))
+
+;; Autocompletion
+(unless slow-computer
+  (use-package company
+    :hook
+    (after-init . global-company-mode)))
+
 ;; Fuzzy autocompletion
 (use-package company-flx
   :after company
   :config
   (company-flx-mode +1))
 
-;;;;;;;;;;;;;;;;;;;; Programming / other ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; cmake integration
 (unless slow-computer
   (use-package cmake-ide
@@ -198,6 +194,13 @@
     (setq cmake-ide-build-dir "build")
     (cmake-ide-setup)))
 
+;; Indentation
+(setq-default indent-tabs-mode nil
+              tab-width 4)
+;(setq tab-width 4)
+(setq c-default-style "linux"
+      c-basic-offset 4)
+
 ;; Project management
 (unless slow-computer
   (use-package projectile
@@ -223,6 +226,25 @@
   (c++-mode . load-realgud)
   (c-mode   . load-realgud))
 
+;; Highlight TODO, FIXME, NOTE
+(use-package hl-todo
+  :config
+  (global-hl-todo-mode t))
+
+;; Better commenting
+(use-package smart-comment
+  :bind
+  ("C-c c" . smart-comment))
+
+;; Toggle betweeen beginning of line and beginning of code
+(defun beginning-of-line-or-indentation ()
+  "Move to beginning of line, or indentation."
+  (interactive)
+  (if (bolp)
+      (back-to-indentation)
+    (beginning-of-line)))
+(global-set-key (kbd "<home>") 'beginning-of-line-or-indentation)
+
 ;;;;;;;;;;;;;;;;;;;; Misc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Directory tree
 (use-package neotree
@@ -232,13 +254,6 @@
   :bind
   ("<f8>" . neotree-toggle))
 
-;; Indentation
-(setq-default indent-tabs-mode nil
-              tab-width 4)
-;(setq tab-width 4)
-(setq c-default-style "linux"
-      c-basic-offset 4)
-
 (use-package git-commit)
 (use-package magit
   :bind
@@ -276,17 +291,7 @@
   (global-fci-mode t)
   (advice-add 'company-call-frontends :before #'on-off-fci-before-company))
 
-;; Highlight TODO, FIXME, NOTE
-(use-package hl-todo
-  :config
-  (global-hl-todo-mode t))
-
-;; Better commenting
-(use-package smart-comment
-  :bind
-  ("C-c c" . smart-comment))
-
-;; IDO
+;; Interactive substring matching
 (use-package ido)
 (use-package flx-ido
   :after ido
@@ -297,15 +302,6 @@
   (setq ido-enable-flex-matching t)
   (setq ido-ignore-extensions t))
 
-;; Toggle betweeen beginning of line and beginning of code
-(defun beginning-of-line-or-indentation ()
-  "Move to beginning of line, or indentation."
-  (interactive)
-  (if (bolp)
-      (back-to-indentation)
-    (beginning-of-line)))
-(global-set-key (kbd "<home>") 'beginning-of-line-or-indentation)
-
 ;; Tab bar
 (unless slow-computer
   (use-package tabbar-ruler
diff --git a/server/server b/server/server
index d847cf9..99bff8d 100644
--- a/server/server
+++ b/server/server
@@ -1,2 +1,2 @@
-127.0.0.1:51313 22977
+127.0.0.1:51313 10436
 phahw2ohVoh0oopheish7IVie9desh8aequeenei3uo8wahShe%thuadaeNa4ieh
\ No newline at end of file