diff --git a/.gitmodules b/.gitmodules
index 8bad0f4..8b16cdc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "emacs.d/naquadah-theme"]
 	path = emacs.d/naquadah-theme
 	url = git://git.naquadah.org/naquadah-theme.git
+[submodule "emacs.d/auto-complete-clang"]
+	path = emacs.d/auto-complete-clang
+	url = git://github.com/brianjcj/auto-complete-clang.git
diff --git a/emacs b/emacs
index 97f83e5..52357ef 100644
--- a/emacs
+++ b/emacs
@@ -1,6 +1,7 @@
 ;; -*- mode: Emacs-Lisp; -*-
 (add-to-list 'load-path "~/.emacs.d")
 (add-to-list 'load-path "~/.emacs.d/naquadah-theme")
+(add-to-list 'load-path "~/.emacs.d/auto-complete-clang")
 
 ;; Requires
 (require 'uniquify)
@@ -8,10 +9,10 @@
 (require 'color-theme)
 (require 'flymake)
 (require 'color-theme-gruber-darker)
-(require 'tabbar)
 (require 'minimap)
 (require 'column-marker)
 (require 'color-theme-weirdness)
+(require 'auto-complete-clang)
 
 ;; Auto complete
 (require 'auto-complete-config)
@@ -52,8 +53,6 @@
                                         ; autosave file location
  inhibit-default-init t)
 (setq-default indent-tabs-mode nil)     ; spaces, no tabs
-;;(setq whitespace-line-column 80)
-;;(setq whitespace-style '(face lines))
 
 (fset 'yes-or-no-p 'y-or-n-p)           ; switch yes or no answers to y or n
                                         ; answers
@@ -74,8 +73,6 @@
 ;; Keybindings
 (global-set-key "\C-m"  'newline-and-indent) ; Automatically indent on newline
 (global-set-key (kbd "C-x n r")    'narrow-to-region            )
-(global-set-key [C-next]           'tabbar-forward              )
-(global-set-key [C-prior]          'tabbar-backward             )
 (global-set-key [C-tab]            'hs-toggle-hiding            )
 (global-set-key (kbd "<f9>")       'compile)
 
@@ -84,6 +81,7 @@
 (add-to-list 'auto-mode-alist '("\\.vapi$" . vala-mode))
 (add-to-list 'auto-mode-alist '("\\.cs$"   . csharp-mode))
 (add-to-list 'auto-mode-alist '("\\.bat$"  . batch-mode))
+(add-to-list 'auto-mode-alist '("\\.lua$"  . lua-mode))
 
 (add-to-list 'file-coding-system-alist '("\\.vala$" . utf-8))
 (add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8))
@@ -91,8 +89,6 @@
 (add-to-list 'compilation-finish-functions 'my-comp-finish-function)
 
 ;; Color theme
-;(color-theme-weirdness2)
-;(require 'naquadah-theme)
 (require 'naquadah-theme)
 
 ;; Test for frame fonts
@@ -124,7 +120,10 @@
 (add-hook 'c-mode-hook
           (lambda ()
             (hs-minor-mode t)
-            (column-marker-1 80)))
+            (column-marker-1 80)
+;            (auto-complete-mode)
+;            (setq ac-sources '(ac-source-clang))
+            ))
 ;;; CSS
 (add-hook 'css-mode-hook
           (lambda ()
@@ -149,14 +148,13 @@
   ;; If you edit it by hand, you could mess it up, so be careful.
   ;; Your init file should contain only one such instance.
   ;; If there is more than one, they won't work right.
- '(tabbar-mode t nil (tabbar)))
+)
 (custom-set-faces
   ;; custom-set-faces was added by Custom.
   ;; If you edit it by hand, you could mess it up, so be careful.
   ;; Your init file should contain only one such instance.
   ;; If there is more than one, they won't work right.
- '(tabbar-selected ((t (:inherit tabbar-default :background "#1E2320" :foreground "#F0DFAF"))))
- '(tabbar-unselected ((nil (:background "#3F3F3F" :foreground "#DCDCCC")))))
+)
 
 
 ;;; This was installed by package-install.el.
diff --git a/emacs.d/auto-complete-clang b/emacs.d/auto-complete-clang
new file mode 160000
index 0000000..9db79f4
--- /dev/null
+++ b/emacs.d/auto-complete-clang
@@ -0,0 +1 @@
+Subproject commit 9db79f4a88e22041c6cc1acfa834bb7ff8bec459