diff --git a/init.el b/init.el
index 4d8c56f..753bd83 100755
--- a/init.el
+++ b/init.el
@@ -66,14 +66,14 @@
 (setq tab-always-indent nil) ;; tab key inserts tabs after hitting indent point
 
 ;; display mismatched whitespace at the beginning or end of lines
-(add-hook 'after-change-major-mode-hook
-          (lambda ()
-            (if (derived-mode-p 'prog-mode)
-                (progn
-                  (if (eq indent-tabs-mode t)
-                      (setq whitespace-style '(face indentation::tab trailing missing-newline-at-eof))
-                    (setq whitespace-style '(face indentation::space trailing missing-newline-at-eof)))
-                  (whitespace-mode t)))))
+;; (add-hook 'after-change-major-mode-hook
+;;           (lambda ()
+;;             (if (derived-mode-p 'prog-mode)
+;;                 (progn
+;;                   (if (eq indent-tabs-mode t)
+;;                       (setq whitespace-style '(face indentation::tab trailing missing-newline-at-eof))
+;;                     (setq whitespace-style '(face indentation::space trailing missing-newline-at-eof)))
+;;                   (whitespace-mode t)))))
 
 (add-hook 'prog-mode-hook 'enable-tabs)
 (add-hook 'lisp-mode-hook 'disable-tabs)
@@ -99,6 +99,8 @@
 ;; Packages
 (require 'use-package)
 
+(electric-pair-mode)
+
 ;; Evil (Vim Emulation)
 (use-package evil
   :init
@@ -134,10 +136,9 @@
 
 ;; Avy (jump to char)
 (use-package avy
-  :bind
-    (("C-;" . avy-goto-char)
-	   ("C-:" . avy-goto-word-1)
-	   ("M-g g" . avy-goto-line)))
+  :bind (("C-:" . avy-goto-char)
+         ("C-;" . avy-goto-word-1)
+         ("C-'" . avy-goto-line)))
 
 (use-package undo-tree
   :after evil
@@ -299,7 +300,9 @@
   :init
   (setq lsp-headerline-breadcrumb-enable nil
         lsp-signature-auto-activate nil
-        lsp-signature-doc-lines 0)
+        lsp-signature-doc-lines 0
+        lsp-idle-delay 0
+        lsp-enable-snippet nil)
   :config
   (add-hook 'lsp-mode-hook #'lsp-enable-which-key-integration)
   (add-hook 'evil-insert-state-entry-hook #'lsp-signature-activate)
@@ -379,7 +382,7 @@
   :config
   (add-to-list 'lsp-language-id-configuration '(qml-ts-mode . "qml-ts"))
   (lsp-register-client
-   (make-lsp-client :new-connection (lsp-stdio-connection '("qmlls" "-E"))
+   (make-lsp-client :new-connection (lsp-stdio-connection '("qmlls"))
                     :activation-fn (lsp-activate-on "qml-ts")
                     :server-id 'qmlls))
   (add-hook 'qml-ts-mode-hook (lambda ()