diff --git a/linux_pesterchum.sh b/linux_pesterchum.sh
deleted file mode 100755
index 6771a97..0000000
--- a/linux_pesterchum.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd pesterchum3.14
-./pesterchum
diff --git a/menus.py b/menus.py
index 29bd84c..b5d0def 100644
--- a/menus.py
+++ b/menus.py
@@ -735,6 +735,6 @@ class LoadingScreen(QtGui.QDialog):
 class AboutPesterchum(QtGui.QMessageBox):
     def __init__(self, parent=None):
         QtGui.QMessageBox.__init__(self, parent)
-        self.setText("P8STERCHUM V. 3.14 8eta 2 ::::)")
+        self.setText("P3ST3RCHUM V. 3.14")
         self.setInformativeText("Programming by illuminatedwax (ghostDunk), art by Grimlive (aquaMarinist)")
         self.mainwindow = parent
diff --git a/pesterchum b/pesterchum
new file mode 100755
index 0000000..a28ee59
--- /dev/null
+++ b/pesterchum
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+python2.6 pesterchum.py
\ No newline at end of file
diff --git a/setup-win.py b/setup-win.py
new file mode 100644
index 0000000..439ecb7
--- /dev/null
+++ b/setup-win.py
@@ -0,0 +1,45 @@
+# WINDOWS setup file!
+
+from cx_Freeze import setup, Executable
+import sys
+import os
+import os.path
+import shutil
+
+if sys.platform == "win32":
+    base = "Win32GUI"
+else:
+    base = "Console"
+
+setup(
+        name = "PESTERCHUM",
+        version = "3.14",
+        description = "P3ST3RCHUM",
+        executables = [Executable("pesterchum.py",
+                                  base=base,
+                                  compress=True,
+                                  icon="pesterchum.ico",
+                                  )])
+os.rename("build/exe.win32-2.6", "build/pesterchum")
+pcloc = "build/pesterchum"
+
+shutil.copytree("themes", "%s/themes" % (pcloc))
+shutil.copytree("imageformats", "%s/imageformats" % (pcloc))
+shutil.copytree("smilies", "%s/smilies" % (pcloc))
+f = open("%s/pesterchum.js" % (pcloc), 'w')
+f.write("{\"tabs\":true, \"chums\":[]}")
+f.close()
+shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcm90.dll", "%s" % (pcloc))
+shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcp90.dll", "%s" % (pcloc))
+shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcr90.dll", "%s" % (pcloc))
+shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375.manifest",
+            "%s" % (pcloc))
+shutil.copy("pesterchum.nsi", "%s/" % (pcloc))
+shutil.copy("pesterchum-update.nsi", "%s/ % (pcloc)")
+os.mkdir("%s/profiles" % (pcloc))
+os.mkdir("%s/logs" % (pcloc))
+shutil.copy("logs/chums.js", "%s/logs" % (pcloc))
+shutil.copy("readme.txt", "%s/" % (pcloc))
+shutil.copy("themes.txt", "%s/" % (pcloc))
+
+
diff --git a/setup.py b/setup.py
deleted file mode 100644
index 92bb6e6..0000000
--- a/setup.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from cx_Freeze import setup, Executable
-import sys
-import os
-import os.path
-import shutil
-
-if sys.platform == "win32":
-    base = "Win32GUI"
-else:
-    base = "Console"
-
-setup(
-        name = "PESTERCHUM",
-        version = "3.14",
-        description = "P3ST3RCHUM",
-        executables = [Executable("pesterchum.py",
-                                  base=base,
-                                  compress=True,
-                                  icon="pesterchum.ico",
-                                  )])
-if sys.platform == "win32":
-    os.rename("build/exe.win32-2.6", "build/pesterchum")
-    pcloc = "build/pesterchum"
-else:
-    os.mkdir("build/pesterchum")
-    if os.path.exists("build/exe.linux-x86_64-2.6"):
-        os.rename("build/exe.linux-x86_64-2.6", "build/pesterchum/pesterchum3.14")
-    else:
-        os.rename("build/exe.linux-i686-2.6", "build/pesterchum/pesterchum3.14")
-    pcloc = "build/pesterchum/pesterchum3.14"
-
-shutil.copytree("themes", "%s/themes" % (pcloc))
-#shutil.copytree("imageformats", "%s/imageformats" % (pcloc))
-shutil.copytree("smilies", "%s/smilies" % (pcloc))
-f = open("%s/pesterchum.js" % (pcloc), 'w')
-f.write("{\"tabs\":true, \"chums\":[]}")
-f.close()
-#shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcm90.dll", "%s" % (pcloc))
-#shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcp90.dll", "%s" % (pcloc))
-#shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/msvcr90.dll", "%s" % (pcloc))
-#shutil.copy("C:/Dev/Py26MSdlls-9.0.21022.8/msvc/x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.21022.8_x-ww_d08d0375.manifest",
-#            "%s" % (pcloc))
-#shutil.copy("pesterchum.nsi", "%s/" % (pcloc))
-#shutil.copy("pesterchum-update.nsi", "%s/ % (pcloc)")
-os.mkdir("%s/profiles" % (pcloc))
-os.mkdir("%s/logs" % (pcloc))
-shutil.copy("logs/chums.js", "%s/logs" % (pcloc))
-shutil.copy("readme.txt", "%s/" % (pcloc))
-shutil.copy("themes.txt", "%s/" % (pcloc))
-shutil.copy("linux_pesterchum.sh", "build/pesterchum/pesterchum")
-