diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index e93d97b..275cfdf 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -36,6 +36,8 @@ CHANGELOG
 * Disable randomEncounter options when it's offline - Kiooeht [evacipatedBox] (Idea: Lexi [lexicalNuance])
 * Sort list of memos alphabetically or by number of users - Kiooeht [evacipatedBox] (Idea: [lostGash])
 * Low-bandwidth mode - Kiooeht [evacipatedBox] (Idea: [canLover])
+* New smilies - Kiooeht [evacipatedBox]
+* Refresh theme in options - Kiooeht [evacipatedBox]
 * Bug fixes
     * Don't delete random chum when blocking someone not on chumroll - Kiooeht [evacipatedBox]
     * Openning global userlist doesn't reset OP status of memo users - Kiooeht [evacipatedBox]
diff --git a/TODO.mkdn b/TODO.mkdn
index ee5de75..0a700ff 100644
--- a/TODO.mkdn
+++ b/TODO.mkdn
@@ -24,6 +24,7 @@ Features
 * "Pester" menu option to just pester a handle
 * Auto-login Nickserv
 * Make toast notifications only on certain chums
+* Separate tabbed/untabbed memos and convos
 
 Bugs
 ----
diff --git a/menus.py b/menus.py
index 9d5be1b..40f8000 100644
--- a/menus.py
+++ b/menus.py
@@ -1165,6 +1165,9 @@ class PesterOptions(QtGui.QDialog):
             self.themeBox.addItem(t)
             if (not notheme and t == theme.name) or (notheme and t == "pesterchum"):
                 self.themeBox.setCurrentIndex(i)
+        self.refreshtheme = QtGui.QPushButton("Refresh current theme", self)
+        self.connect(self.refreshtheme, QtCore.SIGNAL('clicked()'),
+                     parent, QtCore.SLOT('themeSelectOverride()'))
 
         self.buttonOptions = ["Minimize to Taskbar", "Minimize to Tray", "Quit"]
         self.miniBox = QtGui.QComboBox(self)
@@ -1349,6 +1352,7 @@ class PesterOptions(QtGui.QDialog):
         layout_theme.setAlignment(QtCore.Qt.AlignTop)
         layout_theme.addWidget(QtGui.QLabel("Pick a Theme:"))
         layout_theme.addWidget(self.themeBox)
+        layout_theme.addWidget(self.refreshtheme)
         self.pages.addWidget(widget)
 
         # Advanced
diff --git a/pesterchum.py b/pesterchum.py
index 6a0fce0..ff1e2ce 100644
--- a/pesterchum.py
+++ b/pesterchum.py
@@ -2331,9 +2331,16 @@ class PesterWindow(MovingWindow):
                           self, QtCore.SLOT('close()'));
 
     @QtCore.pyqtSlot()
-    def themeSelected(self):
-        themename = unicode(self.optionmenu.themeBox.currentText())
-        if themename != self.theme.name:
+    def themeSelectOverride(self):
+        self.themeSelected(self.theme.name)
+
+    @QtCore.pyqtSlot()
+    def themeSelected(self, override=False):
+        if not override:
+            themename = unicode(self.optionmenu.themeBox.currentText())
+        else:
+            themename = override
+        if override or themename != self.theme.name:
             try:
                 self.changeTheme(pesterTheme(themename))
             except ValueError, e: