diff --git a/parsetools.py b/parsetools.py
index cdbc877..68bef9b 100644
--- a/parsetools.py
+++ b/parsetools.py
@@ -273,7 +273,20 @@ smiledict = {
     ":flipout:": "weasel.gif",
     ":befuddled:": "what.gif",
     ":pumpkin:": "whatpumpkin.gif",
-    ":trollcool:": "trollcool.gif"}
+    ":trollcool:": "trollcool.gif",
+    ":jadecry:": "jadespritehead.gif",
+    ":ecstatic:": "ecstatic.gif",
+    ":relaxed:": "relaxed.gif",
+    ":discontent:": "discontent.gif",
+    ":devious:": "devious.gif",
+    ":sleek:": "sleek.gif",
+    ":detestful:": "detestful.gif",
+    ":mirthful:": "mirthful.gif",
+    ":manipulative:": "manipulative.gif",
+    ":vigorous:": "vigorous.gif",
+    ":perky:": "perky.gif",
+    ":acceptant:": "acceptant.gif",
+    }
 
 reverse_smiley = dict((v,k) for k, v in smiledict.iteritems())
 _smilere = re.compile("|".join(smiledict.keys()))
diff --git a/pesterchum.nsi b/pesterchum.nsi
index 3e73fd6..4274ac3 100644
--- a/pesterchum.nsi
+++ b/pesterchum.nsi
@@ -3,7 +3,7 @@
 Name "PESTERCHUM3.14a"
 
 ; The file to write
-OutFile "pesterchum3.14a.3.exe"
+OutFile "pesterchum3.148.2.exe"
 
 InstallDir C:\Pesterchum
 
@@ -22,7 +22,7 @@ UninstPage instfiles
 Section "Pesterchum"
 
   SectionIn RO
-  
+
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR
   
@@ -46,6 +46,7 @@ Section "Pesterchum"
   CreateShortcut "$SMPROGRAMS\Pesterchum\Uninstall.lnk" "$INSTDIR\uninstall.exe"
   CreateShortcut "$SMPROGRAMS\Pesterchum\Logs.lnk" "$INSTDIR\logs"
 
+
 SectionEnd
 
 
diff --git a/pesterchum.py b/pesterchum.py
index db183ec..cb269ad 100644
--- a/pesterchum.py
+++ b/pesterchum.py
@@ -108,7 +108,6 @@ class PesterLog(object):
 
 class PesterProfileDB(dict):
     def __init__(self):
-        self.filemutex = QtCore.QMutex()
         if sys.platform != "darwin":
             self.logpath = "logs"
         else:
@@ -133,16 +132,13 @@ class PesterProfileDB(dict):
         self.update(converted)
 
     def save(self):
-        self.filemutex.lock()
         try:
             fp = open("%s/chums.js" % (self.logpath), 'w')
             chumdict = dict([p.plaindict() for p in self.itervalues()])
             json.dump(chumdict, fp)
             fp.close()
         except Exception, e:
-            self.filemutex.unlock()
             raise e
-        self.filemutex.unlock()
     def getColor(self, handle, default=None):
         if not self.has_key(handle):
             return default
@@ -281,7 +277,7 @@ class userConfig(object):
         l.pop(l.index(handle))
         self.set('block', l)
     def server(self):
-        return self.config.get('server', 'irc.tymoon.eu')
+        return self.config.get('server', 'irc.mindfang.org')
     def port(self):
         return self.config.get('port', '6667')
     def soundOn(self):
@@ -507,7 +503,8 @@ class chumArea(RightClickList):
         for c in chums:
             c.setColor(color)
     def initTheme(self, theme):
-        self.setGeometry(*(theme["main/chums/loc"]+theme["main/chums/size"]))
+        self.resize(*theme["main/chums/size"])
+        self.move(*theme["main/chums/loc"])
         if theme.has_key("main/chums/scrollbar"):
             self.setStyleSheet("QListWidget { %s } QScrollBar { %s } QScrollBar::handle { %s } QScrollBar::add-line { %s } QScrollBar::sub-line { %s } QScrollBar:up-arrow { %s } QScrollBar:down-arrow { %s }" % (theme["main/chums/style"], theme["main/chums/scrollbar/style"], theme["main/chums/scrollbar/handle"], theme["main/chums/scrollbar/downarrow"], theme["main/chums/scrollbar/uparrow"], theme["main/chums/scrollbar/uarrowstyle"], theme["main/chums/scrollbar/darrowstyle"] ))
         else:
@@ -1232,7 +1229,7 @@ class PesterWindow(MovingWindow):
                 self.show()
             else:
                 if self.isActiveWindow():
-                    self.hide()
+                    self.closeToTray()
                 else:
                     self.raise_()
                     self.activateWindow()
@@ -1241,8 +1238,6 @@ class PesterWindow(MovingWindow):
 
     @QtCore.pyqtSlot()
     def connected(self):
-        print "CONNECTED!"
-        print self.loadingscreen
         if self.loadingscreen:
             self.loadingscreen.done(QtGui.QDialog.Accepted)
         self.loadingscreen = None
@@ -1972,7 +1967,6 @@ class MainProgram(QtCore.QObject):
             else:
                 widget.loadingscreen.hideReconnect()
             status = widget.loadingscreen.exec_()
-            print "exited with status %d" % status
             if status == QtGui.QDialog.Rejected:
                 sys.exit(0)
             else:
@@ -1990,17 +1984,13 @@ class MainProgram(QtCore.QObject):
             self.widget.loadingscreen = None
         self.attempts += 1
         if hasattr(self, 'irc') and self.irc:
-            print "tryagain: reconnectIRC()"
             self.irc.reconnectIRC()
-            print "finishing"
             self.irc.quit()
         else:
-            print "tryagain: restartIRC()"
             self.restartIRC()
     @QtCore.pyqtSlot()
     def restartIRC(self):
         if hasattr(self, 'irc') and self.irc:
-            print "deleting IRC"
             self.disconnectWidgets(self.irc, self.widget)
             stop = self.irc.stopIRC
             del self.irc
@@ -2016,7 +2006,6 @@ class MainProgram(QtCore.QObject):
                 msg = "R3CONN3CT1NG %d" % (self.attempts)
             else:
                 msg = "CONN3CT1NG"
-            print "loadingscreen: auto reconnect"
             self.reconnectok = False
             self.showLoading(self.widget, msg)
         else:
diff --git a/readme.txt b/readme.txt
index cad2adb..bc76799 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,10 +5,20 @@ Here's some tips to help you get started:
 - You can import your old Pesterchum contacts by going to
 CLIENT->IMPORT and opening your pesterchum.cfg file. This is usually
 in the 2.5 base directory or in Tinychum's data folder.
-- The Trollian theme can be confusing if you haven't used the program
-already! Some hints: moods are set by clicking the timelines, and you
+- Some themes can be confusing if you haven't used the program
+already! Some hints: 
+
+Trollian: Moods are set by clicking the timelines, and you
 can add chums by clicking "Chumproll." Moods correspond to the troll
-that would most likely exhibit them.
+that would most likely exhibit them. You can go offline by hitting the
+"Timelines" menu bar.
+
+Gold: Add chums by hitting the two chumpeoples in the upper left
+corner. Go offline by clicking the "CHUMHANDLE:" label.
+
+Enamel: Add chums by hitting the "CHUMROLL" label. Go offline by
+clicking the upper left hand corner.
+
 - Right-click is your friend! There are useful right click
 options on the chumroll, by clicking the chumhandle in a conversation,
 online userlist, or the list of memo browsers.
diff --git a/smilies/acceptant.png b/smilies/acceptant.png
new file mode 100644
index 0000000..dfb44ca
Binary files /dev/null and b/smilies/acceptant.png differ
diff --git a/smilies/detestful.png b/smilies/detestful.png
new file mode 100644
index 0000000..dc573df
Binary files /dev/null and b/smilies/detestful.png differ
diff --git a/smilies/devious.png b/smilies/devious.png
new file mode 100644
index 0000000..eae4799
Binary files /dev/null and b/smilies/devious.png differ
diff --git a/smilies/distraught.png b/smilies/distraught.png
new file mode 100644
index 0000000..c923891
Binary files /dev/null and b/smilies/distraught.png differ
diff --git a/smilies/ecstatic.png b/smilies/ecstatic.png
new file mode 100644
index 0000000..edb062e
Binary files /dev/null and b/smilies/ecstatic.png differ
diff --git a/smilies/jadespritehead.gif b/smilies/jadespritehead.gif
new file mode 100644
index 0000000..bb28391
Binary files /dev/null and b/smilies/jadespritehead.gif differ
diff --git a/smilies/manipulative.png b/smilies/manipulative.png
new file mode 100644
index 0000000..d686bbc
Binary files /dev/null and b/smilies/manipulative.png differ
diff --git a/smilies/mirthful.png b/smilies/mirthful.png
new file mode 100644
index 0000000..e7d54fe
Binary files /dev/null and b/smilies/mirthful.png differ
diff --git a/smilies/perky.png b/smilies/perky.png
new file mode 100644
index 0000000..2b24953
Binary files /dev/null and b/smilies/perky.png differ
diff --git a/smilies/relaxed.png b/smilies/relaxed.png
new file mode 100644
index 0000000..caf9e6f
Binary files /dev/null and b/smilies/relaxed.png differ
diff --git a/smilies/sleek.png b/smilies/sleek.png
new file mode 100644
index 0000000..fa4311f
Binary files /dev/null and b/smilies/sleek.png differ
diff --git a/smilies/vigorous.png b/smilies/vigorous.png
new file mode 100644
index 0000000..382e23a
Binary files /dev/null and b/smilies/vigorous.png differ
diff --git a/themes/enamel/protective.png b/themes/enamel/protective.png
index aedba54..3135aa5 100644
Binary files a/themes/enamel/protective.png and b/themes/enamel/protective.png differ
diff --git a/themes/enamel/style.js b/themes/enamel/style.js
index 0ca2661..803709d 100644
--- a/themes/enamel/style.js
+++ b/themes/enamel/style.js
@@ -266,8 +266,7 @@
   "systemMsgColor": "#646464"
  },
  "memos":
- {"memoicon": "$path/memo.png",
-  "style": "background-color: rgba(0,0,0,0); border-width: 5px; border-image:url($path/convobg.png) 5px; font-family: 'Century Gothic'; selection-background-color:#919191; ",
+ {"style": "background-color: rgba(0,0,0,0); border-width: 5px; border-image:url($path/convobg.png) 5px; font-family: 'Century Gothic'; selection-background-color:#919191; ",
   "size": [500,325],
   "tabs": {
       "style": "",
diff --git a/themes/trollian fun/moodcheck1.png b/themes/gold xl/protective.png
similarity index 76%
rename from themes/trollian fun/moodcheck1.png
rename to themes/gold xl/protective.png
index cbf9089..3135aa5 100644
Binary files a/themes/trollian fun/moodcheck1.png and b/themes/gold xl/protective.png differ
diff --git a/themes/trollian fun/moodcheck10.png b/themes/trollian fun/moodcheck10.png
deleted file mode 100644
index bc4bb89..0000000
Binary files a/themes/trollian fun/moodcheck10.png and /dev/null differ
diff --git a/themes/trollian fun/moodcheck11.png b/themes/trollian fun/moodcheck11.png
deleted file mode 100644
index 4e0a6f9..0000000
Binary files a/themes/trollian fun/moodcheck11.png and /dev/null differ
diff --git a/themes/trollian fun/moodcheck12.png b/themes/trollian fun/moodcheck12.png
deleted file mode 100644
index db68e58..0000000
Binary files a/themes/trollian fun/moodcheck12.png and /dev/null differ
diff --git a/themes/trollian fun/moodcheck2.png b/themes/trollian fun/moodcheck2.png
deleted file mode 100644
index dc69144..0000000
Binary files a/themes/trollian fun/moodcheck2.png and /dev/null differ
diff --git a/themes/trollian fun/moodcheck3.png b/themes/trollian fun/moodcheck3.png
deleted file mode 100644
index 905f223..0000000
Binary files a/themes/trollian fun/moodcheck3.png and /dev/null differ
diff --git a/themes/trollian fun/moodcheck4.png b/themes/trollian fun/moodcheck4.png
deleted file mode 100644
index db47d29..0000000
Binary files a/themes/trollian fun/moodcheck4.png and /dev/null differ
diff --git a/themes/trollian fun/moodcheck5.png b/themes/trollian fun/moodcheck5.png
deleted file mode 100644
index 6b4cca6..0000000
Binary files a/themes/trollian fun/moodcheck5.png and /dev/null differ
diff --git a/themes/trollian fun/moodcheck6.png b/themes/trollian fun/moodcheck6.png
deleted file mode 100644
index d064475..0000000
Binary files a/themes/trollian fun/moodcheck6.png and /dev/null differ
diff --git a/themes/trollian fun/moodcheck7.png b/themes/trollian fun/moodcheck7.png
deleted file mode 100644
index 66f3e58..0000000
Binary files a/themes/trollian fun/moodcheck7.png and /dev/null differ
diff --git a/themes/trollian fun/moodcheck8.png b/themes/trollian fun/moodcheck8.png
deleted file mode 100644
index 3562943..0000000
Binary files a/themes/trollian fun/moodcheck8.png and /dev/null differ
diff --git a/themes/trollian fun/moodcheck9.png b/themes/trollian fun/moodcheck9.png
deleted file mode 100644
index 520e5fd..0000000
Binary files a/themes/trollian fun/moodcheck9.png and /dev/null differ
diff --git a/themes/trollian fun/style.js b/themes/trollian fun/style.js
deleted file mode 100644
index ea195b5..0000000
--- a/themes/trollian fun/style.js	
+++ /dev/null
@@ -1,111 +0,0 @@
-{"inherits": "trollian",
- "main": {
-   "moods": [
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck1.png); border:0px;",
-        "loc": [25, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 17
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck2.png); border:0px;",
-        "loc": [60, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 9
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck3.png); border:0px;",
-        "loc": [95, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 11
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck4.png); border:0px;",
-        "loc": [130, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 1
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck5.png); border:0px;",
-        "loc": [165, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 16
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck6.png); border:0px;",
-        "loc": [200, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 8
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck7.png); border:0px;",
-        "loc": [235, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 10
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck8.png); border:0px;",
-        "loc": [270, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 14
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck9.png); border:0px;",
-        "loc": [305, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 15
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck10.png); border:0px;",
-        "loc": [340, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 13
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck11.png); border:0px;",
-        "loc": [375, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 12
-      },
-      { "style": "border:0px;",
-        "selected": "background-image:url($path/moodcheck12.png); border:0px;",
-        "loc": [410, 141],
-        "size": [20, 270],
-        "text": "",
-        "icon": "",
-        "mood": 7
-      },
-      
-      { "style": "border:0px;color: rgba(0, 0, 0, 0%);",
-        "selected": "border:0px; color: rgba(0, 0, 0, 0%);",
-        "loc": [12, 117],
-        "size": [435, 18],
-        "text": "",
-        "icon": "",
-        "mood": 2
-      }
-  ]
- }
-}
\ No newline at end of file
diff --git a/themes/trollian2.5/protective.png b/themes/trollian2.5/protective.png
new file mode 100644
index 0000000..c400a6c
Binary files /dev/null and b/themes/trollian2.5/protective.png differ
diff --git a/themes/trollian2.5/vigorous.png b/themes/trollian2.5/vigorous.png
new file mode 100644
index 0000000..382e23a
Binary files /dev/null and b/themes/trollian2.5/vigorous.png differ