diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 79044c3..8791fe1 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -81,7 +81,10 @@
    '(markdown-header-face-3 (:inherit 'org-level-3))
    '(markdown-header-face-4 (:inherit 'org-level-4))
    '(markdown-header-face-5 (:inherit 'org-level-5))
-   '(markdown-header-face-6 (:inherit 'org-level-6))))
+   '(markdown-header-face-6 (:inherit 'org-level-6))
+
+   '(ac-candidate-face (:inherit 'header-line :box nil))
+   '(ac-selection-face (:inherit 'hl-line :box nil))))
 
 ;;-----[ Autopair ]------------------------------------------------------
 (require 'autopair)
@@ -371,7 +374,8 @@
 (add-to-list 'auto-mode-alist '("\\.js\\(on\\)?$" . js-mode))
 
 ;;-----[ CSS mode ]------------------------------------------------------
-(add-to-list 'auto-mode-alist '("\\.css$"             . css-mode))
+(add-to-list 'auto-mode-alist '("\\.css$" . css-mode))
+(add-hook 'css-mode-hook 'rainbow-mode)
 
 ;;-----[ ELPA ]----------------------------------------------------------
 (setq package-archives
@@ -445,73 +449,6 @@
 
 (add-hook 'before-save-hook 'oni/before-save-hook)
 (add-hook 'after-save-hook 'oni/after-save-hook)
-(add-hook 'css-mode-hook              'rainbow-mode)
-
-(define-skeleton myaethon-set-varchar-docstring
-  "A docstring for a varchar setter"
-  ""
-  "\/* Setter for the "
-  (skeleton-read "name: ")
-  " column\n"
-  "\n"
-  '(indent-according-to-mode)
-  "$value: string, no longer than "
-  (skeleton-read "len: ")
-  " characters */"
-  '(fill-paragraph))
-
-(define-skeleton myaethon-set-array-varchar-docstring
-  "A docstring for an array/varchar setter"
-  ""
-  '(setq name (skeleton-read "name: "))
-  '(setq len (string-to-number (skeleton-read "length: ")))
-  '(setq size (floor (/ (- len 1) 2)))
-  "/* Setter for the "
-  name
-  " column\n"
-  "\n"
-  '(indent-according-to-mode)
-  "$value: array, with no more than "
-  (number-to-string size)
-  " elements; string, no langer than "
-  (number-to-string len)
-  " characters */"
-  '(fill-paragraph))
-
-(define-skeleton myaethon-simple-entity
-  "A basic database entity"
-  ""
-  '(setq name (skeleton-read "Name: "))
-  "<?php\n"
-  "require_once('classes/dbobject.php');\n"
-  "\n"
-  "/* Entity for the " (downcase name) " table */\n"
-  "class " name " extends DB_Object\n"
-  "{\n"
-  "/* Table to select data from */\n"
-  "protected static $tables = '" (downcase name) "';\n"
-  "\n"
-  "/* Get the name of this class\n"
-  "--\n"
-  "ret: __CLASS__ */\n"
-  "protected static function get_class_name()\n"
-  "{\n"
-  "return __CLASS__;\n"
-  "}\n"
-  "\n"
-  "public function update()\n"
-  "{\n"
-  "throw new Exception('Not Implemented.');\n"
-  "}\n"
-  "\n"
-  "public function insert()\n"
-  "{\n"
-  "throw new Exception('Not Implemented.');\n"
-  "}\n"
-  "}\n"
-  "\n"
-  "?>\n"
-  '(indent-region (point-min) (point-max)))
 
 (make-face 'font-lock-operator-face)
 (make-face 'font-lock-end-statement)