diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c564245..3d431a2 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,10 @@
     <bookmark url="file://$PROJECT_DIR$/gooey/image_repository.py" line="33" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="c98c4f39-9f79-4674-9cd3-7d4122eb5aa3" name="Default" comment="Merge branch 'patch-1' of git://github.com/svisser/Gooey into svisser-patch-1&#10;&#10;Conflicts:&#10;&#9;setup.py&#10;" />
+    <list default="true" id="c98c4f39-9f79-4674-9cd3-7d4122eb5aa3" name="Default" comment="Merge branch 'patch-1' of git://github.com/svisser/Gooey into svisser-patch-1&#10;&#10;Conflicts:&#10;&#9;setup.py&#10;">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/setup.py" afterPath="$PROJECT_DIR$/setup.py" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+    </list>
     <ignored path="Gooey.iws" />
     <ignored path=".idea/workspace.xml" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -26,88 +29,19 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="mockapp.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gooey/mockapplications/mockapp.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="14" column="4" selection-start="205" selection-end="205" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="952">
-              <folding>
-                <element signature="e#48#58#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="example_argparse_souce_in_try.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gooey/mockapplications/example_argparse_souce_in_try.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="91" column="68" selection-start="2256" selection-end="2256" vertical-scroll-proportion="0.0" vertical-offset="1088" max-vertical-offset="2839">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="components.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gooey/gui/components.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="28" column="25" selection-start="451" selection-end="474" vertical-scroll-proportion="0.0" vertical-offset="714" max-vertical-offset="5661">
-              <folding>
-                <element signature="e#131#140#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.md" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="88" column="15" selection-start="3275" selection-end="3275" vertical-scroll-proportion="-19.6" vertical-offset="1006" max-vertical-offset="3808">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="module_with_no_argparse.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gooey/mockapplications/module_with_no_argparse.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="13" column="0" selection-start="129" selection-end="129" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="340">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="example_argparse_souce_in_main.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gooey/mockapplications/example_argparse_souce_in_main.py">
+      <file leaf-file-name="i18n.py" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gooey/i18n.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="50" column="6" selection-start="897" selection-end="897" vertical-scroll-proportion="0.0" vertical-offset="952" max-vertical-offset="2499">
+            <state line="31" column="11" selection-start="708" selection-end="708" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="850">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="gooey_decorator.py" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gooey/gooey_decorator.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="23" column="5" selection-start="579" selection-end="579" vertical-scroll-proportion="0.0" vertical-offset="271" max-vertical-offset="1700">
-              <folding>
-                <element signature="e#49#78#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="setup.py" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/setup.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="9" column="36" selection-start="213" selection-end="213" vertical-scroll-proportion="0.21398601" vertical-offset="0" max-vertical-offset="715">
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="README.txt" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.txt">
-          <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1326">
+            <state line="30" column="6" selection-start="723" selection-end="723" vertical-scroll-proportion="0.5465632" vertical-offset="0" max-vertical-offset="902">
               <folding />
             </state>
           </provider>
@@ -187,7 +121,7 @@
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
+    <option name="x" value="1912" />
     <option name="y" value="-8" />
     <option name="width" value="1936" />
     <option name="height" value="1056" />
@@ -638,15 +572,14 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="false" />
+    <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32937366" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32937366" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32937366" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24960506" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1637704" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1637704" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39956802" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
@@ -656,6 +589,7 @@
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32937366" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -754,11 +688,6 @@
         <state line="74" column="0" selection-start="2313" selection-end="2313" vertical-scroll-proportion="-0.44409448" vertical-offset="1421" max-vertical-offset="2958" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gooey/i18n.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="42" column="6" selection-start="996" selection-end="996" vertical-scroll-proportion="0.9905512" vertical-offset="51" max-vertical-offset="850" />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/gooey/gui/argparse_test_data.py">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="493" />
@@ -883,9 +812,7 @@
     </entry>
     <entry file="file://C:/Python27/Lib/abc.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="64" column="6" selection-start="1777" selection-end="1777" vertical-scroll-proportion="0.33228347" vertical-offset="843" max-vertical-offset="3213">
-          <folding />
-        </state>
+        <state line="64" column="6" selection-start="1777" selection-end="1777" vertical-scroll-proportion="0.33228347" vertical-offset="843" max-vertical-offset="3213" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/gooey/gui/footer.py">
@@ -910,18 +837,12 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/gooey/gui/base_window.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="76" column="24" selection-start="1983" selection-end="1983" vertical-scroll-proportion="0.0" vertical-offset="1115" max-vertical-offset="1955">
-          <folding>
-            <element signature="e#142#151#0" expanded="true" />
-          </folding>
-        </state>
+        <state line="76" column="24" selection-start="1983" selection-end="1983" vertical-scroll-proportion="0.0" vertical-offset="1115" max-vertical-offset="1955" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/gooey/gui/styling.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="35" column="13" selection-start="959" selection-end="959" vertical-scroll-proportion="0.7622378" vertical-offset="50" max-vertical-offset="765">
-          <folding />
-        </state>
+        <state line="35" column="13" selection-start="959" selection-end="959" vertical-scroll-proportion="0.7622378" vertical-offset="50" max-vertical-offset="765" />
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/gooey/gui/advanced_config.py">
@@ -929,71 +850,58 @@
         <state line="86" column="0" selection-start="2545" selection-end="2545" vertical-scroll-proportion="0.4378788" vertical-offset="1173" max-vertical-offset="1938" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gooey/mockapplications/example_argparse_souce_in_try.py">
+    <entry file="file://$PROJECT_DIR$/gooey/gui/components.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="91" column="68" selection-start="2256" selection-end="2256" vertical-scroll-proportion="0.0" vertical-offset="1088" max-vertical-offset="2839">
-          <folding />
-        </state>
+        <state line="28" column="25" selection-start="451" selection-end="474" vertical-scroll-proportion="0.0" vertical-offset="714" max-vertical-offset="5661" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gooey/gui/components.py">
+    <entry file="file://$PROJECT_DIR$/gooey/mockapplications/example_argparse_souce_in_main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="28" column="25" selection-start="451" selection-end="474" vertical-scroll-proportion="0.0" vertical-offset="714" max-vertical-offset="5661">
-          <folding>
-            <element signature="e#131#140#0" expanded="true" />
-          </folding>
-        </state>
+        <state line="50" column="6" selection-start="897" selection-end="897" vertical-scroll-proportion="0.0" vertical-offset="952" max-vertical-offset="2499" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gooey/mockapplications/module_with_no_argparse.py">
+    <entry file="file://$PROJECT_DIR$/README.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="13" column="0" selection-start="129" selection-end="129" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="340">
-          <folding />
-        </state>
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1326" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gooey/mockapplications/example_argparse_souce_in_main.py">
+    <entry file="file://$PROJECT_DIR$/gooey/gooey_decorator.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="50" column="6" selection-start="897" selection-end="897" vertical-scroll-proportion="0.0" vertical-offset="952" max-vertical-offset="2499">
-          <folding />
-        </state>
+        <state line="23" column="5" selection-start="579" selection-end="579" vertical-scroll-proportion="0.13333334" vertical-offset="84" max-vertical-offset="1513" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gooey/mockapplications/mockapp.py">
+    <entry file="file://$PROJECT_DIR$/gooey/mockapplications/module_with_no_argparse.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="4" selection-start="205" selection-end="205" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="952">
-          <folding>
-            <element signature="e#48#58#0" expanded="true" />
-          </folding>
-        </state>
+        <state line="13" column="0" selection-start="129" selection-end="129" vertical-scroll-proportion="0.24555555" vertical-offset="0" max-vertical-offset="900" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/gooey/gooey_decorator.py">
+    <entry file="file://$PROJECT_DIR$/README.md">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="23" column="5" selection-start="579" selection-end="579" vertical-scroll-proportion="0.0" vertical-offset="271" max-vertical-offset="1700">
-          <folding>
-            <element signature="e#49#78#0" expanded="true" />
-          </folding>
-        </state>
+        <state line="88" column="15" selection-start="3328" selection-end="3328" vertical-scroll-proportion="0.5684455" vertical-offset="1006" max-vertical-offset="3825" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.txt">
+    <entry file="file://$PROJECT_DIR$/gooey/mockapplications/example_argparse_souce_in_try.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="91" column="68" selection-start="2256" selection-end="2256" vertical-scroll-proportion="-0.11333334" vertical-offset="1547" max-vertical-offset="2839" />
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/gooey/mockapplications/mockapp.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1326">
+        <state line="14" column="4" selection-start="205" selection-end="205" vertical-scroll-proportion="0.15111111" vertical-offset="0" max-vertical-offset="900">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
+    <entry file="file://$PROJECT_DIR$/gooey/i18n.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="88" column="15" selection-start="3275" selection-end="3275" vertical-scroll-proportion="-19.6" vertical-offset="1006" max-vertical-offset="3808">
+        <state line="31" column="11" selection-start="708" selection-end="708" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="850">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/setup.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="9" column="36" selection-start="213" selection-end="213" vertical-scroll-proportion="0.21398601" vertical-offset="0" max-vertical-offset="715">
+        <state line="30" column="6" selection-start="723" selection-end="723" vertical-scroll-proportion="0.5465632" vertical-offset="0" max-vertical-offset="902">
           <folding />
         </state>
       </provider>
diff --git a/setup.py b/setup.py
index 33d6f2b..bb83cc3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,16 @@
+import os 
 from distutils.core import setup
 
 with open('README.md') as readme:
-	long_description = readme.read()
+  long_description = readme.read()
+
+local_path = os.path.join(os.path.dirname(__file__), 'gooey') 
+
+images = [image for image in os.listdir(os.path.join(local_path, 'images'))]
+
+languages = [lang 
+            for lang in os.listdir(os.path.join(local_path, 'languages'))
+            if '.py' not in lang]
 
 setup(
     name='Gooey',
@@ -15,8 +24,13 @@ setup(
       'gooey.languages',
       'gooey.mockapplications',
     ],
+
+    data_files=[
+      ('gooey/images', images), 
+      ('gooey/languages', languages)
+    ],
     url='http://pypi.python.org/pypi/Gooey/',
     license='LICENSE.txt',
     description='Turn (almost) any command line program into a full GUI application with one line',
-		long_description=long_description
+    long_description=long_description
 )