diff --git a/conkeror/themes/blackened/mode-line.css b/conkeror/themes/blackened/mode-line.css
deleted file mode 100644
index 207a039..0000000
--- a/conkeror/themes/blackened/mode-line.css
+++ /dev/null
@@ -1,10 +0,0 @@
-.mode-line {
-    font: 11px Tahoma;
-    padding: 0px;
-    border: 1px solid #444;
-    background-color: #000;
-}
-
-.mode-line label {
-    color: white;
-}
diff --git a/conkeror/themes/blackened/conkeror--scrollbars.css b/conkeror/themes/naquadah/conkeror--scrollbars.css
similarity index 100%
rename from conkeror/themes/blackened/conkeror--scrollbars.css
rename to conkeror/themes/naquadah/conkeror--scrollbars.css
diff --git a/conkeror/themes/blackened/hints--url-panel.css b/conkeror/themes/naquadah/hints--url-panel.css
similarity index 100%
rename from conkeror/themes/blackened/hints--url-panel.css
rename to conkeror/themes/naquadah/hints--url-panel.css
diff --git a/conkeror/themes/blackened/minibuffer.css b/conkeror/themes/naquadah/minibuffer.css
similarity index 67%
rename from conkeror/themes/blackened/minibuffer.css
rename to conkeror/themes/naquadah/minibuffer.css
index 5f13391..c882f3e 100644
--- a/conkeror/themes/blackened/minibuffer.css
+++ b/conkeror/themes/naquadah/minibuffer.css
@@ -2,13 +2,21 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #minibuffer {
-    background-color: #000;
-    border: 1px solid #444;
+    background-color: #252A2E;
+    border: 0px none #444;
     border-top: 0;
-    color: white;
+    color: #EEEEEC;
     font: 11px Tahoma;
 }
 
+#minibuffer-input, #minibuffer-input * {
+    color: #EEEEEC;
+}
+
+#minibuffer-prompt {
+    color: #EEEEEC;
+}
+
 /* Completions display */
 
 tree.completions treechildren { border: none !important; }
@@ -18,19 +26,19 @@ tree.completions {
   -moz-appearance: none !important;
   border: 0px none !important;
   border-top: 4px double #333333 !important;
-  background-color: black !important;
+  background-color: #252A2E !important;
   -moz-border-top-colors: -moz-initial !important;
-  color: white !important;
+  color: #EEEEEC !important;
 }
 
 tree.completions treechildren::-moz-tree-row {
-  background-color: black !important;
+  background-color: #252A2E !important;
   border: none;
 }
 
 tree.completions treechildren::-moz-tree-row(current) {
-  background-color: blue !important;
-  color: white;
+  background-color: #0C191C !important;
+  color: #EEEEEC;
 }
 
 tree.completions treechildren::-moz-tree-cell-text(completion-description) {
@@ -39,6 +47,6 @@ tree.completions treechildren::-moz-tree-cell-text(completion-description) {
 }
 
 tree.completions treechildren::-moz-tree-cell-text(current) {
-  color: white !important;
+  color: #EEEEEC !important;
 }
 
diff --git a/conkeror/themes/naquadah/mode-line.css b/conkeror/themes/naquadah/mode-line.css
new file mode 100644
index 0000000..7e1ed45
--- /dev/null
+++ b/conkeror/themes/naquadah/mode-line.css
@@ -0,0 +1,11 @@
+.mode-line {
+    font: 11px Tahoma;
+    padding: 0px;
+    border: 1px solid #2E3436;
+    color: #EEEEEC;
+    background-color: #0C191C;
+}
+
+.mode-line label {
+    color: #EEEEEC;
+}
diff --git a/conkeror/themes/blackened/new-tabs.css b/conkeror/themes/naquadah/new-tabs.css
similarity index 100%
rename from conkeror/themes/blackened/new-tabs.css
rename to conkeror/themes/naquadah/new-tabs.css
diff --git a/conkeror/themes/blackened/theme.json b/conkeror/themes/naquadah/theme.json
similarity index 100%
rename from conkeror/themes/blackened/theme.json
rename to conkeror/themes/naquadah/theme.json
diff --git a/conkerorrc b/conkerorrc
index 10cb2f6..233f453 100644
--- a/conkerorrc
+++ b/conkerorrc
@@ -2,7 +2,7 @@
 cwd = make_file("/home/slash/downloads/");
 
 theme_load_paths.push("/home/slash/.conkeror/themes/");
-theme_load("blackened");
+theme_load("naquadah");
 
 define_webjump("archwiki",
                "http://wiki.archlinux.org/index.php?search=%s",
@@ -13,3 +13,6 @@ define_webjump("aur",
 define_webjump("archpackages",
                "http://www.archlinux.org/packages/?sort=&q=%s&limit=50",
                $alternative="http://packages.archlinux.org");
+define_webjump("emacswiki",
+               "http://www.google.com/cse?cx=004774160799092323420%3A6-ff2s0o6yi&q=%s",
+               $alternative="http://www.emacswiki.org");