diff --git a/deluge/ui/web/css/xtheme-default.css b/deluge/ui/web/css/xtheme-default.css
new file mode 100644
index 000000000..c74216984
--- /dev/null
+++ b/deluge/ui/web/css/xtheme-default.css
@@ -0,0 +1,3 @@
+.x-btn button {
+    color: Black;
+}
\ No newline at end of file
diff --git a/deluge/ui/web/themes/vista/basic-dialog/bg-center.gif b/deluge/ui/web/themes/vista/basic-dialog/bg-center.gif
deleted file mode 100644
index 7bf4a4b41..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/bg-center.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/basic-dialog/bg-left.gif b/deluge/ui/web/themes/vista/basic-dialog/bg-left.gif
deleted file mode 100644
index 94b1dafc7..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/bg-left.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/basic-dialog/bg-right.gif b/deluge/ui/web/themes/vista/basic-dialog/bg-right.gif
deleted file mode 100644
index 6dadaf683..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/bg-right.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/basic-dialog/close.gif b/deluge/ui/web/themes/vista/basic-dialog/close.gif
deleted file mode 100644
index 4278db983..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/close.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/basic-dialog/collapse.gif b/deluge/ui/web/themes/vista/basic-dialog/collapse.gif
deleted file mode 100644
index b07e297e5..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/collapse.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/basic-dialog/dlg-bg.gif b/deluge/ui/web/themes/vista/basic-dialog/dlg-bg.gif
deleted file mode 100644
index 1a466633d..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/dlg-bg.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/basic-dialog/e-handle.gif b/deluge/ui/web/themes/vista/basic-dialog/e-handle.gif
deleted file mode 100644
index 48877e748..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/e-handle.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/basic-dialog/expand.gif b/deluge/ui/web/themes/vista/basic-dialog/expand.gif
deleted file mode 100644
index 5b4b0d1e9..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/expand.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/basic-dialog/hd-sprite.gif b/deluge/ui/web/themes/vista/basic-dialog/hd-sprite.gif
deleted file mode 100644
index 3c2dd632d..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/hd-sprite.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/basic-dialog/s-handle.gif b/deluge/ui/web/themes/vista/basic-dialog/s-handle.gif
deleted file mode 100644
index c13c9cdc0..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/s-handle.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/basic-dialog/se-handle.gif b/deluge/ui/web/themes/vista/basic-dialog/se-handle.gif
deleted file mode 100644
index c4e38a2f4..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/se-handle.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/basic-dialog/w-handle.gif b/deluge/ui/web/themes/vista/basic-dialog/w-handle.gif
deleted file mode 100644
index d59eafc20..000000000
Binary files a/deluge/ui/web/themes/vista/basic-dialog/w-handle.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/gradient-bg.gif b/deluge/ui/web/themes/vista/gradient-bg.gif
deleted file mode 100644
index 8134e4994..000000000
Binary files a/deluge/ui/web/themes/vista/gradient-bg.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/grid/grid-split.gif b/deluge/ui/web/themes/vista/grid/grid-split.gif
deleted file mode 100644
index c76a16e95..000000000
Binary files a/deluge/ui/web/themes/vista/grid/grid-split.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/grid/grid-vista-hd.gif b/deluge/ui/web/themes/vista/grid/grid-vista-hd.gif
deleted file mode 100644
index d0972638e..000000000
Binary files a/deluge/ui/web/themes/vista/grid/grid-vista-hd.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/layout/collapse.gif b/deluge/ui/web/themes/vista/layout/collapse.gif
deleted file mode 100644
index cbd6e081c..000000000
Binary files a/deluge/ui/web/themes/vista/layout/collapse.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/layout/expand.gif b/deluge/ui/web/themes/vista/layout/expand.gif
deleted file mode 100644
index 8103c0dd7..000000000
Binary files a/deluge/ui/web/themes/vista/layout/expand.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/layout/gradient-bg.gif b/deluge/ui/web/themes/vista/layout/gradient-bg.gif
deleted file mode 100644
index d311e7de6..000000000
Binary files a/deluge/ui/web/themes/vista/layout/gradient-bg.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/layout/ns-collapse.gif b/deluge/ui/web/themes/vista/layout/ns-collapse.gif
deleted file mode 100644
index f2ad235da..000000000
Binary files a/deluge/ui/web/themes/vista/layout/ns-collapse.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/layout/ns-expand.gif b/deluge/ui/web/themes/vista/layout/ns-expand.gif
deleted file mode 100644
index 0817ec66f..000000000
Binary files a/deluge/ui/web/themes/vista/layout/ns-expand.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/layout/panel-close.gif b/deluge/ui/web/themes/vista/layout/panel-close.gif
deleted file mode 100644
index 4e96481a1..000000000
Binary files a/deluge/ui/web/themes/vista/layout/panel-close.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/layout/panel-title-bg.gif b/deluge/ui/web/themes/vista/layout/panel-title-bg.gif
deleted file mode 100644
index 681f517a3..000000000
Binary files a/deluge/ui/web/themes/vista/layout/panel-title-bg.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/layout/panel-title-light-bg.gif b/deluge/ui/web/themes/vista/layout/panel-title-light-bg.gif
deleted file mode 100644
index 23d8288b0..000000000
Binary files a/deluge/ui/web/themes/vista/layout/panel-title-light-bg.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/layout/stick.gif b/deluge/ui/web/themes/vista/layout/stick.gif
deleted file mode 100644
index 7db68eec9..000000000
Binary files a/deluge/ui/web/themes/vista/layout/stick.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/layout/tab-close-on.gif b/deluge/ui/web/themes/vista/layout/tab-close-on.gif
deleted file mode 100644
index 556e905b1..000000000
Binary files a/deluge/ui/web/themes/vista/layout/tab-close-on.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/layout/tab-close.gif b/deluge/ui/web/themes/vista/layout/tab-close.gif
deleted file mode 100644
index 0a6f01987..000000000
Binary files a/deluge/ui/web/themes/vista/layout/tab-close.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/qtip/bg.gif b/deluge/ui/web/themes/vista/qtip/bg.gif
deleted file mode 100644
index 5c0e8c92a..000000000
Binary files a/deluge/ui/web/themes/vista/qtip/bg.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/qtip/tip-sprite.gif b/deluge/ui/web/themes/vista/qtip/tip-sprite.gif
deleted file mode 100644
index a1862865d..000000000
Binary files a/deluge/ui/web/themes/vista/qtip/tip-sprite.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/s.gif b/deluge/ui/web/themes/vista/s.gif
deleted file mode 100644
index 1d11fa9ad..000000000
Binary files a/deluge/ui/web/themes/vista/s.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/e-handle-dark.gif b/deluge/ui/web/themes/vista/sizer/e-handle-dark.gif
deleted file mode 100644
index eac9662ea..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/e-handle-dark.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/e-handle.gif b/deluge/ui/web/themes/vista/sizer/e-handle.gif
deleted file mode 100644
index f2c9f5382..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/e-handle.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/ne-handle-dark.gif b/deluge/ui/web/themes/vista/sizer/ne-handle-dark.gif
deleted file mode 100644
index c9c041c45..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/ne-handle-dark.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/ne-handle.gif b/deluge/ui/web/themes/vista/sizer/ne-handle.gif
deleted file mode 100644
index 942ae8253..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/ne-handle.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/nw-handle-dark.gif b/deluge/ui/web/themes/vista/sizer/nw-handle-dark.gif
deleted file mode 100644
index 23fced98b..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/nw-handle-dark.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/nw-handle.gif b/deluge/ui/web/themes/vista/sizer/nw-handle.gif
deleted file mode 100644
index d39b0c38d..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/nw-handle.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/s-handle-dark.gif b/deluge/ui/web/themes/vista/sizer/s-handle-dark.gif
deleted file mode 100644
index ddc2e18ce..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/s-handle-dark.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/s-handle.gif b/deluge/ui/web/themes/vista/sizer/s-handle.gif
deleted file mode 100644
index 827c3330a..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/s-handle.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/se-handle-dark.gif b/deluge/ui/web/themes/vista/sizer/se-handle-dark.gif
deleted file mode 100644
index 1a678e67f..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/se-handle-dark.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/se-handle.gif b/deluge/ui/web/themes/vista/sizer/se-handle.gif
deleted file mode 100644
index 69b5a9ed5..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/se-handle.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/sw-handle-dark.gif b/deluge/ui/web/themes/vista/sizer/sw-handle-dark.gif
deleted file mode 100644
index 937102c6b..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/sw-handle-dark.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/sizer/sw-handle.gif b/deluge/ui/web/themes/vista/sizer/sw-handle.gif
deleted file mode 100644
index b9e2f563a..000000000
Binary files a/deluge/ui/web/themes/vista/sizer/sw-handle.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/tabs/tab-btm-inactive-left-bg.gif b/deluge/ui/web/themes/vista/tabs/tab-btm-inactive-left-bg.gif
deleted file mode 100644
index 667beeb32..000000000
Binary files a/deluge/ui/web/themes/vista/tabs/tab-btm-inactive-left-bg.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/tabs/tab-btm-inactive-right-bg.gif b/deluge/ui/web/themes/vista/tabs/tab-btm-inactive-right-bg.gif
deleted file mode 100644
index 6c4e0a45f..000000000
Binary files a/deluge/ui/web/themes/vista/tabs/tab-btm-inactive-right-bg.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/tabs/tab-btm-left-bg.gif b/deluge/ui/web/themes/vista/tabs/tab-btm-left-bg.gif
deleted file mode 100644
index 1d81e54e1..000000000
Binary files a/deluge/ui/web/themes/vista/tabs/tab-btm-left-bg.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/tabs/tab-btm-right-bg.gif b/deluge/ui/web/themes/vista/tabs/tab-btm-right-bg.gif
deleted file mode 100644
index 47d005002..000000000
Binary files a/deluge/ui/web/themes/vista/tabs/tab-btm-right-bg.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/tabs/tab-sprite.gif b/deluge/ui/web/themes/vista/tabs/tab-sprite.gif
deleted file mode 100644
index a16eedb82..000000000
Binary files a/deluge/ui/web/themes/vista/tabs/tab-sprite.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/toolbar/gray-bg.gif b/deluge/ui/web/themes/vista/toolbar/gray-bg.gif
deleted file mode 100644
index 9af15c262..000000000
Binary files a/deluge/ui/web/themes/vista/toolbar/gray-bg.gif and /dev/null differ
diff --git a/deluge/ui/web/themes/vista/toolbar/tb-btn-sprite.gif b/deluge/ui/web/themes/vista/toolbar/tb-btn-sprite.gif
deleted file mode 100644
index f21b0d612..000000000
Binary files a/deluge/ui/web/themes/vista/toolbar/tb-btn-sprite.gif and /dev/null differ