diff --git a/.spacemacs b/.spacemacs
index 8645cdf..25b860e 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -47,6 +47,7 @@ This function is called at the very end of Spacemacs initialization."
  '(ahs-idle-interval 0.25)
  '(ahs-idle-timer 0 t)
  '(ahs-inhibit-face-list nil)
+ '(company-backends (quote ((company-tern :with company-yasnippet) (php-extras-company :with company-yasnippet :with company-gtags :with company-capf :with company-dabbrev-code :with company-keywords :with company-files) (company-elisp :with company-yasnippet) (company-bbdb :with company-yasnippet) (company-nxml :with company-yasnippet) (company-css :with company-yasnippet) (company-eclim :with company-yasnippet) (company-semantic :with company-yasnippet) (company-clang :with company-yasnippet) (company-xcode :with company-yasnippet) (company-ropemacs :with company-yasnippet) (company-cmake :with company-yasnippet) (company-capf :with company-yasnippet) (company-dabbrev-code company-gtags company-etags company-keywords :with company-yasnippet) (company-oddmuse :with company-yasnippet) (company-files :with company-yasnippet) (company-dabbrev :with company-yasnippet))))
  '(custom-safe-themes (quote ("8aebf25556399b58091e533e455dd50a6a9cba958cc4ebb0aab175863c25b9a4" default)))
  '(elfeed-feeds (quote ("https://www.drupal.org/planet/rss.xml")))
  '(gnutls-min-prime-bits 1024)
diff --git a/.spacemacs_contribs/kostajh/config.el b/.spacemacs_contribs/kostajh/config.el
index 5a22716..c832ccc 100644
--- a/.spacemacs_contribs/kostajh/config.el
+++ b/.spacemacs_contribs/kostajh/config.el
@@ -1,6 +1,9 @@
 (add-to-list 'package-archives
                '("marmalade" . "https://marmalade-repo.org/packages/"))

+;; Linum
+(add-hook 'prog-mode-hook 'linum-mode)
+
 ;; Enable flycheck for the following modes
 (dolist (mode '(php
                 drupal
@@ -31,18 +34,6 @@
 (setq org-clock-persist 'history)
 (org-clock-persistence-insinuate)

-(add-hook 'org-clock-in-hook
-          'kostajh/org-active-task-to-file)
-(add-hook 'org-clock-out-hook
-          'kostajh/org-active-task-to-file)
-
-
-(defun kostajh/org-active-task-to-file ()
-  "Write the active task to a file"
-  (interactive)
-  ;; (append-to-file org-clock-current-task nil "/tmp/activetask.txt")
-    )
-
 ; Targets include this file and any file contributing to the agenda - up to 9 levels deep
 (setq org-refile-targets (quote ((nil :maxlevel . 9)
                                  (org-agenda-files :maxlevel . 9))))
@@ -67,13 +58,12 @@
 ; Use the current window for indirect buffer display
 (setq org-indirect-buffer-display 'current-window)

-
 ;; Programming hooks
 (add-hook 'prog-mode-hook 'flyspell-prog-mode)
-;;(add-hook 'prog-mode-hook 'ggtags-mode)
+(add-hook 'prog-mode-hook 'ggtags-mode)

 ;; PHP hooks
-;;(add-hook 'php-mode-hook 'ggtags-mode)
+(add-hook 'php-mode-hook 'ggtags-mode)
 (add-hook 'php-mode-hook 'turn-on-eldoc-mode)
 (add-hook 'php-mode-hook 'setq-local eldoc-documentation-function #'ggtags-eldoc-function)

@@ -161,7 +151,6 @@
         (list (jabber-muc-read-nickname jabber-group "Nickname: ")))
             (insert (concat "@\"" nickname "\" ")))

-
 ;; Twittering
 (setq twittering-use-master-password t)
 (add-hook 'twittering-edit-mode-hook 'flyspell-mode)