diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8106722..724d7ad 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,12 @@
-# If you wish to contribute:
+# If you wish to contribute manifests and userlists for distros:
+The best way to contribute to this project is by submitting manifests and userlists of distros created with resetter helper. It is actually very easy to do so and does not require to learn any type of coding other than your time.
+
+
+# If you wish to contribute to other things...
 Please check the issues list, there are some things to work on. If I like you work, I'll gladly merge them into my project. If I don't like it, don't take it personal, it just means that we have different views on the topic and I'd prefer to go my way.
 
-# When creating pull/merge requests
+
+# When creating other pull/merge requests
 I'd prefer there to be a message to go with your commit as a comment preferably with some sort of intro detailing what your pull request is about in a courteous manner with good etiquette. If you're being rude, I'll just close it on the spot.
 
 # Would like to contribute but don't know where to start?
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 0010ed0..70dc031 100644
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -6,4 +6,4 @@
 
 *Description of Issue
 
-*content of Log file located in /var/log/resetter/resetter.log
+*content of Log file located in /var/log/resetter/resetter.log if applicable
diff --git a/README.md b/README.md
index 4c3b7ec..a96d448 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Resetter v2.2.0-stable
+# Resetter v2.2.1-stable
 ![alt tag](https://github.com/gaining/Resetter/blob/master/Resetter/resetter-screenshot.png)
 
 It is an application built with python and pyqt that will help to reset an Ubuntu, Linux-Mint, and some other distros to stock, without having to manually re-install by using a live usb/cd/dvd image. For the list of supported distros, please see the *Officially supported distros* section.
@@ -8,7 +8,7 @@ Download the deb files found [here](https://github.com/gaining/Resetter/releases
 
 1. `sudo apt install gdebi`
 2. `sudo gdebi add-apt-key_1.0-0.5_all.deb`
-3. `sudo gdebi resetter_2.2.0-stable_all.deb`
+3. `sudo gdebi resetter_2.2.1-stable_all.deb`
 
 # Official video tutorial - courtesy of *Byte of Linux*
 
@@ -16,9 +16,8 @@ Download the deb files found [here](https://github.com/gaining/Resetter/releases
 
 
 # Status
-- Version 2.2.0 fixes some bugs reported by the community. Easy PPA now works again in Mint 18.3.
-- Check out [Resetter Helper](https://github.com/gaining/ResetterHelper) if you want your distro to have support, by using it, you'll be able to add support yourself, no coding required, no fuss. Just your time. I'll elaborate on that as *ResetterHelper* becomes more mature.
-- The software is stable. Feedback will be greatly appreciated.
+
+- Version 2.2.1 supports virtually all debian based distros, a video demonstrating how to easily support your favourite debian based distro will be uploaded. I also hope to make it the last release of resetter that is based on python2.7 and pyqt4 next version will be based on their respective newer technologies and frameworks.
 - Working Project: Resetter-cli, a version of resetter that runs terminally.
 - Please check the [changelog](https://github.com/gaining/Resetter/blob/master/changelog) for more details.
 
@@ -44,9 +43,9 @@ MPIA means missing pre-installed apps
 | Create custom backup user              |             ✗             |            ✓           |
 | Auto install MPIAs                     |             ✓             |            ✓           |
 | Choose which MPIAs to install          |             ✗             |            ✓           |
-| remove non-default users               |             ✓             |            ✓           |
-| dependent package view                 |             ✗             |            ✓           |
-| remove snap packages                   |             ✓             |            ✓           |
+| Remove non-default users               |             ✓             |            ✓           |
+| Dependent package view                 |             ✗             |            ✓           |
+| Remove snap packages                   |             ✓             |            ✓           |
 
 
 </center>
diff --git a/Resetter/control/control b/Resetter/control/control
index 56a2109..4501b60 100644
--- a/Resetter/control/control
+++ b/Resetter/control/control
@@ -1,12 +1,13 @@
 Package: resetter
-Version: 1.1.2-stable
-Installed-Size: 1420
+Version: 2.2.1-stable
+Installed-Size: 1540
 Maintainer: gaining <gaining7@outlook.com>
 Section: python
 Homepage: https://github.com/gaining/resetter
 Architecture: all
 Priority: optional
 Depends: python-qt4 (>=4.10), python-apt (>=0.9.3), coreutils (>=7.0), python-mechanize (>=1:0.2.5), python-bs4 (>=4.2), add-apt-key (>=1.0)
+Recommends: gtk2-engines-pixbuf (>=2.24)
 Pre-Depends: python (>=2.7.5), policykit-1 (>=0.105)
 Description: Resets debian or ubuntu based distros.
  Resetter is an easy way to reset your debian based linux back to stock. It also has other useful tools such as a ppa manager, an installer and a way to install ppa's straight from launchpad.net.
diff --git a/Resetter/control/md5sums b/Resetter/control/md5sums
index 1efecb9..19d8ff8 100644
--- a/Resetter/control/md5sums
+++ b/Resetter/control/md5sums
@@ -1,53 +1,60 @@
-5cfc8c1fe2e4b885126e7374074b9a23  usr/share/doc/resetter/changelog.gz
+d0417f55b2be80c81396a3c94dc1fe13  usr/share/doc/resetter/changelog.gz
 ff8b2c5b3b785bdccba43c0d5c4d7ad4  usr/share/doc/resetter/copyright
 343ad895e19fc427e6838d58c0929e49  usr/share/applications/Resetter.desktop
 2d4e80f6eff50c865f45d5f0fa9a73fd  usr/share/icons/hicolor/48x48/apps/resetter.png
 2d4e80f6eff50c865f45d5f0fa9a73fd  usr/share/icons/hicolor/48x48/actions/resetter.png
 3ae12c8bfbe97b9d23a1ebbc5d25aa85  usr/share/polkit-1/actions/org.freedesktop.pkexec.resetter.policy
-5e2a9549687bef9c7df6611831823e37  usr/bin/resetter
-b4965813b973b7965f92a3ac8ad44954  usr/lib/resetter/Resetter.py
-309fe700f0a266e8b0d7819133bda3fd  usr/lib/resetter/InstallMissingDialog.py
-c123316b8baff2e0f94c59850db392af  usr/lib/resetter/EasyRepo.py
+e1e5b7bbf099f7236f5897741b1b3152  usr/bin/resetter
+af045ac2532cbf11f375ed0a550e0b7b  usr/lib/resetter/Resetter.py
+0f235c68e491e319ed3287cac495a960  usr/lib/resetter/InstallMissingDialog.py
+c556e4c6fbdf1607fa10a173fe12d38c  usr/lib/resetter/EasyRepo.py
 af74f0fada73e8f76808d693e41eb2ce  usr/lib/resetter/AptProgress.py
-90e7adb81cecea907b9bb43ed397b6c3  usr/lib/resetter/EasyInstall.py
+38fdce2ba996c5df898298583ded5db7  usr/lib/resetter/Tools.py
+6875b930bc2c000f93c039ad6e282cf3  usr/lib/resetter/EasyInstall.py
 74745ad1f2abc29f37e482e5dab8a0f1  usr/lib/resetter/LicenceDialog.py
-80a16ae313ba83aa361caedd7bf62896  usr/lib/resetter/SetEnvironment.py
+649da1de6ac215d5d37f1ec57f57c687  usr/lib/resetter/SetEnvironment.py
 c63abd6b7e36cb91da1ed2d8178f106c  usr/lib/resetter/PackageView.py
-25b964a5c4287cac660f7c962ee0f177  usr/lib/resetter/AboutPage.py
+4e9eadefdf1cbc865becaff14ca5d621  usr/lib/resetter/AboutPage.py
 aeddcec6822875c5b10a8941cd8c2a9e  usr/lib/resetter/Singleton.py
-f52bc82b8b00a8093079494716780498  usr/lib/resetter/CustomApplyDialog.py
+41ba3adb80ed5b50fedd4eaecbcde190  usr/lib/resetter/CustomApplyDialog.py
 727f7601b544022e8efc6a4749f4bc87  usr/lib/resetter/ApplyDialog.py
-b3bd08bcc6a55e593c2d7ef6964f63ab  usr/lib/resetter/Sources.py
-5a8eff781c49e97f733303a8c984b92f  usr/lib/resetter/Account.py
-bfbb4e48360e8d332826e716ddb3b374  usr/lib/resetter/CustomReset.py
-fe78570a148ea7935b85d74432761601  usr/lib/resetter/data/userlists/ubuntu-17.10-default-userlist
-408b5fc1b309d6a25121688278990419  usr/lib/resetter/data/userlists/ubuntu-14.04-default-userlist
-6771c68692f0fdeb1531fdfa1757913c  usr/lib/resetter/data/userlists/mint-17.3-default-userlist
-e44dcded2dd72d48113d5f98df922c70  usr/lib/resetter/data/userlists/ubuntu-16.10-default-userlist
-8acdd47c3ccc264c4dd99c224eb4d221  usr/lib/resetter/data/userlists/eos-0.4-default-userlist
-dd8d3a4d30920a31b143f660944d448f  usr/lib/resetter/data/userlists/mint-18.1-default-userlist
-a75682c688aa0560fcd5636bd18ae096  usr/lib/resetter/data/userlists/deepin-15.4-default-userlist
-e0873fd75c80e4612f106835fe1d9035  usr/lib/resetter/data/userlists/mint-18.2-default-userlist
+225f456920cc72ea6988c98e5c578ddc  usr/lib/resetter/Sources.py
+fa3cdfb695e83e8f30832cc6275c7ac3  usr/lib/resetter/Account.py
+32672eefb33e691452af408f1804a8c7  usr/lib/resetter/CustomReset.py
+e44dcded2dd72d48113d5f98df922c70  usr/lib/resetter/data/userlists/Ubuntu16.10-default-userlist
+dd8d3a4d30920a31b143f660944d448f  usr/lib/resetter/data/userlists/LinuxMint18.3-default-userlist
+a4bb1f544643fddfc230006308ded0d6  usr/lib/resetter/data/userlists/Deepin15.4.1-default-userlist
+f05ddd5abb6ce21efec5481f800e4071  usr/lib/resetter/data/userlists/LinuxMint18.3-default-userlistl
+fe78570a148ea7935b85d74432761601  usr/lib/resetter/data/userlists/Ubuntu17.10-default-userlist
+e0873fd75c80e4612f106835fe1d9035  usr/lib/resetter/data/userlists/LinuxMint18.2-default-userlist
+408b5fc1b309d6a25121688278990419  usr/lib/resetter/data/userlists/Ubuntu14.04-default-userlist
+3282c5a860346028bf5f8788a21da0cd  usr/lib/resetter/data/userlists/Ubuntu16.04-default-userlist
+98903cca236ccce865b4e7252361ba65  usr/lib/resetter/data/userlists/Debian9.2-default-userlist
+8acdd47c3ccc264c4dd99c224eb4d221  usr/lib/resetter/data/userlists/elementary0.4-default-userlist
+a75682c688aa0560fcd5636bd18ae096  usr/lib/resetter/data/userlists/Deepin15.4-default-userlist
+6771c68692f0fdeb1531fdfa1757913c  usr/lib/resetter/data/userlists/LinuxMint17.3-default-userlist
+e6fcf653aa9cbf8c469047923dcb766d  usr/lib/resetter/data/userlists/Deepin15.5-default-userlist
 47e0be83a3e8b8aac5fee41591b770c6  usr/lib/resetter/data/userlists/ubuntu-17.04-default-userlist
-3282c5a860346028bf5f8788a21da0cd  usr/lib/resetter/data/userlists/ubuntu-16.04-default-userlist
-a4bb1f544643fddfc230006308ded0d6  usr/lib/resetter/data/userlists/deepin-15.4.1-default-userlist
-9c98b631a4fa4adea8a2462edb46a0c8  usr/lib/resetter/data/manifests/deepin-15.4.1.manifest
-9115b05a99d24f653c2b8ef7ff6a0137  usr/lib/resetter/data/manifests/mint-17.3-cinnamon.manifest
-d63f2681696a081faa0e227f6c9867c4  usr/lib/resetter/data/manifests/ubuntu-16.10-unity.manifest
-b32137d2a839c07c089bb8882736a084  usr/lib/resetter/data/manifests/mint-18-cinnamon.manifest
-7298196cf6475b24d36d4fc8c2476fda  usr/lib/resetter/data/manifests/deepin-15.4.manifest
-0044572eb3a412c906b5c82f744d5101  usr/lib/resetter/data/manifests/ubuntu-14.04-unity.manifest
-d7bc1afe32841aed1ebbc23f10fec7be  usr/lib/resetter/data/manifests/mint-18.1-cinnamon.manifest
-e13f3e27dfd5284501a08c9549786b1c  usr/lib/resetter/data/manifests/ubuntu-17.04-unity.manifest
-4587fa22cdac9fb515578895d32f4a5f  usr/lib/resetter/data/manifests/ubuntu-17.10.manifest
-a9c13fa149c6aeb8358d458af980fb91  usr/lib/resetter/data/manifests/ubuntu-16.04-unity.manifest
-e632d4ce15b7c91ee652439135d0619f  usr/lib/resetter/data/manifests/mint-18.2-cinnamon.manifest
-1d95dc9211e91e5c6ba0e78b5f6ebef9  usr/lib/resetter/data/manifests/eos-0.4.1.manifest
-c28b7232464662220449c9c3e208c708  usr/lib/resetter/data/manifests/eos-0.4.manifest
-e87c2b7a27c60c01fe97d1ae751014af  usr/lib/resetter/data/scripts/remove-old-kernels.sh
+c28b7232464662220449c9c3e208c708  usr/lib/resetter/data/manifests/elementary0.4.manifest
+9115b05a99d24f653c2b8ef7ff6a0137  usr/lib/resetter/data/manifests/LinuxMint17.3.manifest
+d7bc1afe32841aed1ebbc23f10fec7be  usr/lib/resetter/data/manifests/LinuxMint18.1.manifest
+e632d4ce15b7c91ee652439135d0619f  usr/lib/resetter/data/manifests/LinuxMint18.2.manifest
+7298196cf6475b24d36d4fc8c2476fda  usr/lib/resetter/data/manifests/Deepin15.4.manifest
+a9c13fa149c6aeb8358d458af980fb91  usr/lib/resetter/data/manifests/Ubuntu16.04.manifest
+9c98b631a4fa4adea8a2462edb46a0c8  usr/lib/resetter/data/manifests/Deepin15.4.1.manifest
+5ca7054943cfd7edc6886503dd841a9c  usr/lib/resetter/data/manifests/LinuxMint18.3.manifest
+0044572eb3a412c906b5c82f744d5101  usr/lib/resetter/data/manifests/Ubuntu14.04.manifest
+a3dbfe2f0b26a0e9b237f9ad587c56d0  usr/lib/resetter/data/manifests/Deepin15.5.manifest
+9b75bb16c6f4f9007baf53440e9e2638  usr/lib/resetter/data/manifests/Debian9.2.manifest
+1d95dc9211e91e5c6ba0e78b5f6ebef9  usr/lib/resetter/data/manifests/elementary0.4.1.manifest
+e13f3e27dfd5284501a08c9549786b1c  usr/lib/resetter/data/manifests/Ubuntu17.04.manifest
+d63f2681696a081faa0e227f6c9867c4  usr/lib/resetter/data/manifests/Ubuntu16.10.manifest
+0527708ffc41517715222b0345857222  usr/lib/resetter/data/manifests/Ubuntu17.10.manifest
+b32137d2a839c07c089bb8882736a084  usr/lib/resetter/data/manifests/LinuxMint18.manifest
+d3109e1d8f6314efea84ecfd6ac89b7b  usr/lib/resetter/data/scripts/remove-old-kernels.sh
 060ad4ec73e2d817177159757bfb37a1  usr/lib/resetter/data/scripts/fix-broken.sh
 6e112836a558ace27f57d3a8616d4835  usr/lib/resetter/data/scripts/get-users.sh
-918fa3a4b8534bf29322aca8845c17a1  usr/lib/resetter/data/scripts/new-user.sh
+43a2368dfa4aeefee4c7b0f59559cf89  usr/lib/resetter/data/scripts/new-user.sh
 1cb52038f2d82c4df0229a9c79bcca15  usr/lib/resetter/data/icons/failed.png
 8b9069d9646e3f5e089e1d90d7686558  usr/lib/resetter/data/icons/resetter.png
 af546976dbdbc3bc6ef5e3af2cd9a788  usr/lib/resetter/data/icons/easy-install-icon.png
diff --git a/Resetter/usr/lib/resetter/.idea/workspace.xml b/Resetter/usr/lib/resetter/.idea/workspace.xml
index c98dbd3..7accb41 100644
--- a/Resetter/usr/lib/resetter/.idea/workspace.xml
+++ b/Resetter/usr/lib/resetter/.idea/workspace.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="BookmarkManager">
     <bookmark url="file://$PROJECT_DIR$/AptProgress.py" line="95" />
-    <bookmark url="file://$PROJECT_DIR$/Sources.py" line="98" />
     <bookmark url="file://$PROJECT_DIR$/EasyRepo.py" line="58" />
+    <bookmark url="file://$PROJECT_DIR$/Sources.py" line="100" />
   </component>
   <component name="ChangeListManager">
     <list default="true" id="530bb6fa-fc12-4eb4-9f78-9594a46dcfa5" name="Default" comment="" />
@@ -22,11 +22,21 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Resetter.py" pinned="false" current-in-tab="false">
+      <file leaf-file-name="Resetter.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/Resetter.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="379">
-              <caret line="466" column="5" lean-forward="false" selection-start-line="466" selection-start-column="5" selection-end-line="466" selection-end-column="5" />
+            <state relative-caret-position="-5790">
+              <caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="SetEnvironment.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/SetEnvironment.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="132">
+              <caret line="74" column="50" lean-forward="true" selection-start-line="74" selection-start-column="50" selection-end-line="74" selection-end-column="50" />
               <folding />
             </state>
           </provider>
@@ -35,8 +45,8 @@
       <file leaf-file-name="Tools.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Tools.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="10" column="27" lean-forward="false" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
+            <state relative-caret-position="105">
+              <caret line="7" column="0" lean-forward="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -45,18 +55,18 @@
       <file leaf-file-name="CustomApplyDialog.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/CustomApplyDialog.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2820">
-              <caret line="188" column="20" lean-forward="false" selection-start-line="188" selection-start-column="17" selection-end-line="188" selection-end-column="20" />
+            <state relative-caret-position="2835">
+              <caret line="189" column="0" lean-forward="false" selection-start-line="189" selection-start-column="0" selection-end-line="189" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="InstallMissingDialog.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/InstallMissingDialog.py">
+      <file leaf-file-name="CustomReset.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/CustomReset.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="649">
-              <caret line="144" column="104" lean-forward="false" selection-start-line="144" selection-start-column="104" selection-end-line="144" selection-end-column="104" />
+            <state relative-caret-position="5040">
+              <caret line="336" column="20" lean-forward="false" selection-start-line="336" selection-start-column="12" selection-end-line="336" selection-end-column="20" />
               <folding />
             </state>
           </provider>
@@ -65,18 +75,18 @@
       <file leaf-file-name="PackageView.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/PackageView.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="315">
-              <caret line="21" column="41" lean-forward="false" selection-start-line="21" selection-start-column="40" selection-end-line="21" selection-end-column="41" />
+            <state relative-caret-position="0">
+              <caret line="0" column="21" lean-forward="false" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="AboutPage.py" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/AboutPage.py">
+      <file leaf-file-name="Sources.py" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Sources.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="495">
-              <caret line="33" column="22" lean-forward="false" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
+            <state relative-caret-position="1242">
+              <caret line="95" column="40" lean-forward="false" selection-start-line="95" selection-start-column="40" selection-end-line="95" selection-end-column="40" />
               <folding />
             </state>
           </provider>
@@ -85,8 +95,8 @@
       <file leaf-file-name="EasyInstall.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/EasyInstall.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+            <state relative-caret-position="1137">
+              <caret line="168" column="19" lean-forward="false" selection-start-line="168" selection-start-column="8" selection-end-line="168" selection-end-column="19" />
               <folding />
             </state>
           </provider>
@@ -95,28 +105,8 @@
       <file leaf-file-name="EasyRepo.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/EasyRepo.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1099">
-              <caret line="274" column="0" lean-forward="false" selection-start-line="274" selection-start-column="0" selection-end-line="274" selection-end-column="0" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="SetEnvironment.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/SetEnvironment.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1890">
-              <caret line="126" column="38" lean-forward="false" selection-start-line="126" selection-start-column="30" selection-end-line="126" selection-end-column="38" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Account.py" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Account.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="45">
-              <caret line="3" column="31" lean-forward="false" selection-start-line="3" selection-start-column="31" selection-end-line="3" selection-end-column="31" />
+            <state relative-caret-position="-1515">
+              <caret line="99" column="20" lean-forward="false" selection-start-line="99" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -133,11 +123,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>uninstall</find>
-      <find>selectall</find>
-      <find>logger</find>
-      <find>Settin</find>
-      <find>setting</find>
       <find>self.removeus</find>
       <find>self.adduser1</find>
       <find>adduser1</find>
@@ -163,6 +148,11 @@
       <find>self.rema</find>
       <find>clean</find>
       <find>fix</find>
+      <find>tab</find>
+      <find>removeIt</find>
+      <find>self.model</find>
+      <find>true</find>
+      <find>self.cho</find>
     </findStrings>
   </component>
   <component name="IdeDocumentHistory">
@@ -175,21 +165,21 @@
         <option value="$PROJECT_DIR$/AptProgress2.py" />
         <option value="$PROJECT_DIR$/renamepics.py" />
         <option value="$PROJECT_DIR$/test.py" />
-        <option value="$PROJECT_DIR$/Sources.py" />
         <option value="$PROJECT_DIR$/ApaptableSettings.py" />
         <option value="$PROJECT_DIR$/AptProgress.py" />
         <option value="$PROJECT_DIR$/ApplyDialog.py" />
         <option value="$PROJECT_DIR$/PackageView.py" />
         <option value="$PROJECT_DIR$/CustomReset.py" />
-        <option value="$PROJECT_DIR$/EasyRepo.py" />
         <option value="$PROJECT_DIR$/Account.py" />
         <option value="$PROJECT_DIR$/AboutPage.py" />
-        <option value="$PROJECT_DIR$/SetEnvironment.py" />
         <option value="$PROJECT_DIR$/InstallMissingDialog.py" />
-        <option value="$PROJECT_DIR$/EasyInstall.py" />
+        <option value="$PROJECT_DIR$/CustomApplyDialog.py" />
+        <option value="$PROJECT_DIR$/EasyRepo.py" />
         <option value="$PROJECT_DIR$/Tools.py" />
+        <option value="$PROJECT_DIR$/EasyInstall.py" />
         <option value="$PROJECT_DIR$/Resetter.py" />
-        <option value="$PROJECT_DIR$/CustomApplyDialog.py" />
+        <option value="$PROJECT_DIR$/Sources.py" />
+        <option value="$PROJECT_DIR$/SetEnvironment.py" />
       </list>
     </option>
   </component>
@@ -232,7 +222,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -244,6 +233,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="Scratches" />
     </panes>
   </component>
@@ -503,13 +493,13 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-1" y="0" width="1922" height="1045" extended-state="6" />
+    <frame x="-1" y="0" width="1922" height="1036" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.10572917" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21771611" sideWeight="0.50416666" order="0" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21627408" sideWeight="0.49583334" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2972973" sideWeight="0.49583334" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -531,25 +521,11 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="11" />
+      <option name="time" value="12" />
     </breakpoint-manager>
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/Resetter.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/AboutPage.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/PackageView.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -749,14 +725,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Sources.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1620">
-          <caret line="113" column="33" lean-forward="false" selection-start-line="113" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../resetter-cli/SetEnvironment.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -771,96 +739,116 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CustomReset.py">
+    <entry file="file://$PROJECT_DIR$/Singleton.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4875">
-          <caret line="325" column="18" lean-forward="false" selection-start-line="325" selection-start-column="12" selection-end-line="325" selection-end-column="18" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Singleton.py">
+    <entry file="file://$PROJECT_DIR$/AboutPage.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state relative-caret-position="495">
+          <caret line="33" column="22" lean-forward="false" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/EasyInstall.py">
+    <entry file="file://$PROJECT_DIR$/InstallMissingDialog.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="2175">
+          <caret line="145" column="16" lean-forward="false" selection-start-line="145" selection-start-column="16" selection-end-line="145" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/SetEnvironment.py">
+    <entry file="file://$PROJECT_DIR$/Account.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1890">
-          <caret line="126" column="38" lean-forward="false" selection-start-line="126" selection-start-column="30" selection-end-line="126" selection-end-column="38" />
+        <state relative-caret-position="690">
+          <caret line="46" column="19" lean-forward="false" selection-start-line="46" selection-start-column="18" selection-end-line="46" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../python2.7/urllib.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="163">
+          <caret line="482" column="0" lean-forward="false" selection-start-line="482" selection-start-column="0" selection-end-line="482" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/../python2.7/dist-packages/mechanize/_mechanize.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="193">
+          <caret line="231" column="27" lean-forward="true" selection-start-line="230" selection-start-column="15" selection-end-line="230" selection-end-column="40" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PackageView.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="21" lean-forward="false" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Account.py">
+    <entry file="file://$PROJECT_DIR$/CustomReset.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" column="31" lean-forward="false" selection-start-line="3" selection-start-column="31" selection-end-line="3" selection-end-column="31" />
+        <state relative-caret-position="5040">
+          <caret line="336" column="20" lean-forward="false" selection-start-line="336" selection-start-column="12" selection-end-line="336" selection-end-column="20" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Tools.py">
+    <entry file="file://$PROJECT_DIR$/CustomApplyDialog.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="150">
-          <caret line="10" column="27" lean-forward="false" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
+        <state relative-caret-position="2835">
+          <caret line="189" column="0" lean-forward="false" selection-start-line="189" selection-start-column="0" selection-end-line="189" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Resetter.py">
+    <entry file="file://$PROJECT_DIR$/EasyInstall.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="379">
-          <caret line="466" column="5" lean-forward="false" selection-start-line="466" selection-start-column="5" selection-end-line="466" selection-end-column="5" />
+        <state relative-caret-position="1137">
+          <caret line="168" column="19" lean-forward="false" selection-start-line="168" selection-start-column="8" selection-end-line="168" selection-end-column="19" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/EasyRepo.py">
+    <entry file="file://$PROJECT_DIR$/Tools.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1099">
-          <caret line="274" column="0" lean-forward="false" selection-start-line="274" selection-start-column="0" selection-end-line="274" selection-end-column="0" />
+        <state relative-caret-position="105">
+          <caret line="7" column="0" lean-forward="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/CustomApplyDialog.py">
+    <entry file="file://$PROJECT_DIR$/Sources.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2820">
-          <caret line="188" column="20" lean-forward="false" selection-start-line="188" selection-start-column="17" selection-end-line="188" selection-end-column="20" />
+        <state relative-caret-position="1242">
+          <caret line="95" column="40" lean-forward="false" selection-start-line="95" selection-start-column="40" selection-end-line="95" selection-end-column="40" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/InstallMissingDialog.py">
+    <entry file="file://$PROJECT_DIR$/EasyRepo.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="649">
-          <caret line="144" column="104" lean-forward="false" selection-start-line="144" selection-start-column="104" selection-end-line="144" selection-end-column="104" />
+        <state relative-caret-position="-1515">
+          <caret line="99" column="20" lean-forward="false" selection-start-line="99" selection-start-column="0" selection-end-line="100" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/PackageView.py">
+    <entry file="file://$PROJECT_DIR$/SetEnvironment.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="21" column="41" lean-forward="false" selection-start-line="21" selection-start-column="40" selection-end-line="21" selection-end-column="41" />
+        <state relative-caret-position="132">
+          <caret line="74" column="50" lean-forward="true" selection-start-line="74" selection-start-column="50" selection-end-line="74" selection-end-column="50" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AboutPage.py">
+    <entry file="file://$PROJECT_DIR$/Resetter.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="495">
-          <caret line="33" column="22" lean-forward="false" selection-start-line="33" selection-start-column="22" selection-end-line="33" selection-end-column="22" />
+        <state relative-caret-position="-5790">
+          <caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/Resetter/usr/lib/resetter/EasyRepo.py b/Resetter/usr/lib/resetter/EasyRepo.py
index d4e9fd2..7d92386 100644
--- a/Resetter/usr/lib/resetter/EasyRepo.py
+++ b/Resetter/usr/lib/resetter/EasyRepo.py
@@ -106,10 +106,10 @@ def searchForPPA(self, table):
             browser.select_form(nr=0)
             search_string = self.searchEditText.text()
             found_links = []
-            browser['field.text'] = search_string  # use the proper input type=text name
+            browser['field.text'] = search_string
             browser.submit()
             match = "+archive"
-            exclude = (["+packages", "+build", "+sourcepub"])
+            exclude = ("+packages", "+build", "+sourcepub")
 
             for link in browser.links():
                 if not any(s in link.url for s in exclude) and match in link.url:
@@ -148,12 +148,9 @@ def displayLinks(self, found_links, table, browser):
                 buttonPackageDetails.setText("View packages")
                 buttonPackageDetails.setEnabled(True)
                 buttonPackageDetails.clicked.connect(lambda: self.showPackages(self.table_data))
-                htmltext = browser.open(link.url).read()
-                soup = BeautifulSoup(htmltext, 'html.parser')
+                soup = BeautifulSoup(browser.open(link.url).read(), 'html.parser')
                 ppaTag = soup.find('strong', attrs={'class': 'ppa-reference'})
-                if ppaTag is not None:
-                    ppa_name = ppaTag.text.strip()
-                    ppa.setText(ppa_name)
+                ppa.setText(ppaTag.text.strip())
                 b = QtCore.QByteArray.fromPercentEncoding(link.text)
                 text = b.data().decode('utf8')
                 desc.setText(textwrap.fill(text, 20))
@@ -166,17 +163,13 @@ def displayLinks(self, found_links, table, browser):
                 table.setCellWidget(i, 3, buttonAddPPA)
                 QtGui.qApp.processEvents()
                 repo = soup.find('pre', attrs={'class': 'wrap'})
-                if repo is not None:
-                    repo_name = repo.text.strip()
+                repo_name = repo.text.strip()
                 raw = soup.find('code')
-                if raw is not None:
-                    raw_key = raw.text.strip()
+                raw_key = raw.text.strip()
                 select_node = soup.findAll('select', attrs={'name': 'field.series_filter'})
-                if select_node is not None:
-                    self.isCompatible(select_node, repo_name, raw_key)
+                self.isCompatible(select_node, repo_name, raw_key)
                 sauce = soup.find('table', attrs={'class': 'listing sortable'})
-                if sauce is not None:
-                    self.getTableData(sauce)
+                self.getTableData(sauce)
                 loading += x
                 self.progressbar.setValue(int(loading))
                 QtGui.qApp.processEvents()
diff --git a/Resetter/usr/lib/resetter/Resetter.py b/Resetter/usr/lib/resetter/Resetter.py
old mode 100644
new mode 100755
index a72e287..2270567
--- a/Resetter/usr/lib/resetter/Resetter.py
+++ b/Resetter/usr/lib/resetter/Resetter.py
@@ -4,11 +4,12 @@
 # to work with.
 import datetime
 import logging
+import mechanize
 import os
-import shutil
 import subprocess
 import sys
 import textwrap
+import urllib2
 from PyQt4 import QtCore, QtGui
 from aptsources import sourceslist
 
@@ -51,6 +52,8 @@ def __init__(self, parent=None):
         self.setStatusBar(self.statusbar)
         self.actionOpen = QtGui.QAction(self)
         self.actionOpenUserList = QtGui.QAction(self)
+        self.actionUpdateManifests = QtGui.QAction(self)
+        self.actionUpdateUserlists = QtGui.QAction(self)
 
         self.actionSaveSnapshot = QtGui.QAction(self)
         self.actionSaveSnapshot.setStatusTip('Save a snapshot of currently installed packages. '
@@ -61,8 +64,6 @@ def __init__(self, parent=None):
         self.actionSaveSnapshot.triggered.connect(self.save)
         self.actionSaveSnapshot.setShortcut('Ctrl+S')
 
-
-
         self.actionExit = QtGui.QAction(self)
         self.actionExit.setShortcut('Ctrl+Q')
         self.actionExit.setStatusTip('Exit application')
@@ -87,6 +88,9 @@ def __init__(self, parent=None):
         self.actionShowUsers = QtGui.QAction(self)
         self.actionShowUsers.setStatusTip('View non-default system users')
         self.actionShowUsers.triggered.connect(self.showNonDefaultUsers)
+        self.actionUpdateManifests.triggered.connect(self.fetchUpdatedManifests)
+        self.actionUpdateUserlists.triggered.connect(self.updateUserlists)
+
 
         self.menuFile.addAction(self.actionOpen)
         self.menuFile.addAction(self.actionOpenUserList)
@@ -100,6 +104,9 @@ def __init__(self, parent=None):
         self.menuView.addAction(self.actionShowUsers)
         self.menuTools.addAction(self.actionEasyPPA)
         self.menuTools.addAction(self.actionEditSources)
+        self.menuHelp.addAction(self.actionUpdateManifests)
+        self.menuHelp.addAction(self.actionUpdateUserlists)
+
 
         self.menuHelp.addAction(self.actionAbout)
         self.menubar.addAction(self.menuFile.menuAction())
@@ -122,6 +129,9 @@ def __init__(self, parent=None):
         self.actionShowUsers.setText("Show non-default system users and groups")
         self.actionShowSources.setText("Show system repository list")
         self.actionShow_Installed.setText("Show installed list")
+        self.actionUpdateManifests.setText("Update manifest files")
+        self.actionUpdateUserlists.setText("Update userlist files")
+
         font = QtGui.QFont()
         font.setPointSize(25)
         button_style = ("""
@@ -184,7 +194,7 @@ def __init__(self, parent=None):
         self.os_version_label = QtGui.QLabel()
         self.os_name_label = QtGui.QLabel()
         self.os_codename_label = QtGui.QLabel()
-        self.os_info = self.d_env.os_info#lsb_release.get_lsb_information()
+        self.os_info = self.d_env.os_info
         self.manifest_label = QtGui.QLabel()
         self.userlist_label = QtGui.QLabel()
         dse = QtGui.QGraphicsDropShadowEffect()
@@ -193,10 +203,10 @@ def __init__(self, parent=None):
         self.userlist = self.d_env.userlist
         self.user = self.d_env.user
 
-        self.os_name_label.setText('OS Name: '+self.os_info['ID'])
-        self.os_version_label.setText('OS version: '+self.os_info['RELEASE'])
+        self.os_name_label.setText('OS Name: ' + self.os_info['ID'])
+        self.os_version_label.setText('OS version: ' + self.os_info['RELEASE'])
         self.os_name_label.setGraphicsEffect(dse)
-        self.os_codename_label.setText('codename: '+self.os_info['CODENAME'])
+        self.os_codename_label.setText('codename: ' + self.os_info['CODENAME'])
         self.non_defaults = []
         self.image_label = QtGui.QLabel()
         if self.manifest is not None:
@@ -233,7 +243,7 @@ def __init__(self, parent=None):
     def openManifest(self):
         try:
             manifest = QtGui.QFileDialog.getOpenFileName(self, 'Choose manifest',
-                                            'manifests', "manifest file (*.manifest)")
+                                                         'manifests', "manifest file (*.manifest)")
             if os.path.isfile(manifest):
                 self.manifest = manifest
                 self.manifest_label.setText('Manifest: {}'.format(str(manifest).split('/')[-1]))
@@ -243,7 +253,7 @@ def openManifest(self):
     def openUserList(self):
         try:
             userList = QtGui.QFileDialog.getOpenFileName(self, 'Choose a userlist',
-                                            'userlists', "userlist file (*)")
+                                                         'userlists', "userlist file (*)")
             if os.path.isfile(userList):
                 self.userlist = userList
                 self.userlist_label.setText('Userlist: {}'.format(str(userList).split('/')[-1]))
@@ -291,7 +301,7 @@ def getMissingPackages(self):
             else:
                 word = None
             black_list = (['linux-image', 'linux-headers', 'linux-generic', 'linux-kernel-generic',
-                          'openjdk-7-jre', 'grub'])
+                           'openjdk-7-jre', 'grub'])
             with open("apps-to-install", "w") as output, open("installed", "r") as installed, \
                     open(self.manifest, "r") as man:
                 diff = set(man).difference(installed)
@@ -336,9 +346,9 @@ def getOldKernels(self):
     def warningPrompt(self):
         choice = QtGui.QMessageBox.warning \
             (self, 'RESET EVERYTHING?',
-             "Reset Everything? \n\n This will reset your " + str(self.os_info['DESCRIPTION']) + " installation to its "
-             "factory defaults. Local user accounts and home directories will also be removed."
-                "\n\nAre you sure you\'d like to continue?",
+             "Reset Everything? \n\n This will reset your " + self.os_info['DESCRIPTION'] + " installation to its "
+                                                                                                 "factory defaults. Local user accounts and home directories will also be removed."
+                                                                                                 "\n\nAre you sure you\'d like to continue?",
              QtGui.QMessageBox.Yes | QtGui.QMessageBox.No)
         if choice == QtGui.QMessageBox.Yes:
             QtGui.QApplication.setOverrideCursor(QtCore.Qt.WaitCursor)
@@ -356,8 +366,8 @@ def warningPrompt(self):
 
             else:
                 UsefulTools().showMessage("Nothing left to remove",
-                                        "All removable packages have already been removed, there are no more packages left",
-                                        QtGui.QMessageBox.Information)
+                                          "All removable packages have already been removed, there are no more packages left",
+                                          QtGui.QMessageBox.Information)
                 QtGui.QApplication.restoreOverrideCursor()
 
         else:
@@ -368,10 +378,9 @@ def getInstalledList(self):
             self.logger.info("getting installed list...")
             p1 = subprocess.Popen(['dpkg', '--get-selections'], stdout=subprocess.PIPE, bufsize=1)
             result = p1.stdout
-            tab = '\t'
             with open("installed", "w") as output:
                 for i, line in enumerate(result):
-                    line = line.split(tab, 1)[0]
+                    line = line.split('\t', 1)[0]
                     output.write(line + '\n')
             self.logger.debug("installed list was generated with {} apps installed".format(i))
         except subprocess.CalledProcessError as e:
@@ -383,13 +392,60 @@ def about(self):
         about = About(self)
         about.show()
 
+    def fetchUpdatedManifests(self):
+        try:
+            QtGui.QApplication.setOverrideCursor(QtCore.Qt.WaitCursor)
+            browser = mechanize.Browser()
+            browser.set_handle_robots(False)
+            browser.open('https://github.com/gaining/Resetter/tree/master/Resetter/usr/lib/resetter/data/manifests')
+            browser.addheaders = [("User-agent", "Mozilla/5.0")]
+            for link in browser.links():
+                if 'blob' in link.url:
+                    fname = link.url.split('/')[-1]
+                    file_data = urllib2.urlopen("https://raw.githubusercontent.com/gaining/Resetter/master/Resetter"
+                                                "/usr/lib/resetter/data/manifests/"+fname)
+                    manifest = file_data.read()
+                    with open("manifests/"+fname, 'w') as f:
+                        f.write(manifest)
+        except urllib2.URLError:
+            QtGui.QApplication.restoreOverrideCursor()
+            pass
+        else:
+            QtGui.QApplication.restoreOverrideCursor()
+            UsefulTools().showMessage("Done!", "Manifest directory has been updated",
+                                      QtGui.QMessageBox.Information)
+
+    def updateUserlists(self):
+        try:
+            QtGui.QApplication.setOverrideCursor(QtCore.Qt.WaitCursor)
+            browser = mechanize.Browser()
+            browser.set_handle_robots(False)
+            browser.open('https://github.com/gaining/Resetter/tree/master/Resetter/usr/lib/resetter/data/userlists')
+            browser.addheaders = [("User-agent", "Mozilla/5.0")]
+            for link in browser.links():
+                if 'blob' in link.url:
+                    print link.base_url
+                    fname = link.url.split('/')[-1]
+                    file_data = urllib2.urlopen("https://raw.githubusercontent.com/gaining/Resetter/master/Resetter"
+                                                "/usr/lib/resetter/data/userlists/"+fname)
+                    userlist = file_data.read()
+                    with open("userlists/"+fname, 'w') as f:
+                        f.write(userlist)
+        except urllib2.URLError:
+            QtGui.QApplication.restoreOverrideCursor()
+            pass
+        else:
+            QtGui.QApplication.restoreOverrideCursor()
+            UsefulTools().showMessage("Done!", "Userlists directory has been updated",
+                                      QtGui.QMessageBox.Information)
+
+
     def processManifest(self):
         try:
             self.logger.info("processing updated manifest...")
             with open(self.manifest) as f, open("processed-manifest", "w") as output:
                 for line in f:
-                    tab = '\t'
-                    line = line.split(tab, 1)[0]
+                    line = line.split('\t', 1)[0]
                     if line.endswith('\n'):
                         line = line.strip()
                     output.write(line + '\n')
@@ -402,8 +458,9 @@ def processManifest(self):
     def compareFiles(self):
         try:
             black_list = (['linux-image', 'linux-headers', 'linux-generic', 'ca-certificates', 'pyqt4-dev-tools',
-                          'python-apt', 'python-aptdaemon', 'python-qt4', 'python-qt4-doc', 'libqt',
-                          'pyqt4-dev-tools', 'openjdk', 'python-sip', 'gksu', 'grub', 'python-mechanize', 'python-bs4'])
+                           'python-apt', 'python-aptdaemon', 'python-qt4', 'python-qt4-doc', 'libqt',
+                           'pyqt4-dev-tools', 'openjdk', 'python-sip', 'gksu', 'grub', 'python-mechanize',
+                           'python-bs4'])
             with open("apps-to-remove", "w") as output, open("installed", "r") as installed, \
                     open(self.manifest, "r") as pman:
                 diff = set(installed).difference(pman)
diff --git a/Resetter/usr/lib/resetter/SetEnvironment.py b/Resetter/usr/lib/resetter/SetEnvironment.py
index de14142..fcceb51 100644
--- a/Resetter/usr/lib/resetter/SetEnvironment.py
+++ b/Resetter/usr/lib/resetter/SetEnvironment.py
@@ -92,11 +92,11 @@ def detectOS(self):
         if any(os.path.exists(f) for f in apt_locations):
             manifest = self.os_info['ID'] + self.os_info['RELEASE'] + '.manifest'
             userlist = self.os_info['ID'] + self.os_info['RELEASE'] + '-default-userlist'
-            window_title = self.os_info['ID']
+            window_title = self.os_info['ID'] + ' Resetter'
             return manifest, userlist, window_title
         else:
-            UsefulTools().showMessage("Apt Not Found",
-                             "Apt could not be found, Your distro does not appear to be Debian based.",
+            UsefulTools().showMessage("APT Not Found",
+                             "APT could not be found, your distro does not appear to be Debian based.",
                              QtGui.QMessageBox.Warning)
             exit(1)
 
@@ -111,7 +111,7 @@ def checkForUpdate(self):
             if site_version > current_version:
                 msg = ("There's a new version of Resetter available.\n\n"
                                        "Grab Resetter v{} at "
-                                       "https://github.com/gaining/Resetter/releases".format(site_version))
+                                       "github.com/gaining/Resetter/releases/latest".format(site_version))
                 UsefulTools().showMessage("Update Available", msg, QtGui.QMessageBox.Information)
             else:
                 print("Running most recent version of Resetter")
diff --git a/Resetter/usr/lib/resetter/Sources.py b/Resetter/usr/lib/resetter/Sources.py
index f78b30c..4d87c7b 100644
--- a/Resetter/usr/lib/resetter/Sources.py
+++ b/Resetter/usr/lib/resetter/Sources.py
@@ -7,6 +7,8 @@
 import sys
 from PyQt4 import QtCore, QtGui
 from aptsources import sourceslist
+from Tools import UsefulTools
+
 
 
 class SourceEdit(QtGui.QDialog):
@@ -79,43 +81,41 @@ def editSources(self, title, tip):
 
     def setItems(self, item):
         if item.checkState() == QtCore.Qt.Checked:
-            self.items.append(item.text())
-        if item.checkState() == QtCore.Qt.Unchecked \
-                and len(self.items) > 0 and item.text() in self.items:
-            self.items.remove(item.text())
+            self.items.append(item)
+        if item.checkState() == QtCore.Qt.Unchecked:
+            self.items.remove(item)
 
     def disableSelectedSources(self):
+        char = "#"
         for item in self.items:
-            item = str(item)
-            char = "#"
             for line in fileinput.FileInput(self.sourceslists, inplace=1):
-                if char not in item and item in line:
-                    disable = "# {}".format(item)
-                    line = line.replace(item, disable)
+                if char not in item.text() and item.text() == line.strip()\
+                        and item.checkState() == QtCore.Qt.Checked:
+                    disable = "{} {}".format(char, item.text())
+                    line = line.replace(item.text(), disable)
+                    item.setText(disable)
                 sys.stdout.write(line)
                 fileinput.close()
-        self.close()
-        self.msg.exec_()
+
 
     def enableSelectedSources(self):
         for item in self.items:
-            item = str(item)
             for line in fileinput.FileInput(self.sourceslists, inplace=1):
-                if item in line and item.startswith("#"):
-                    enable = "{}".format(item[2:])
-                    line = line.replace(item, enable)
+                if str(item.text()).startswith("#") and item.text() == line.strip() \
+                        and item.checkState() == QtCore.Qt.Checked:
+                    enable = "{}".format(str(item.text())[2:])
+                    line = line.replace(item.text(), enable)
+                    item.setText(enable)
                 sys.stdout.write(line)
                 fileinput.close()
-        self.close()
-        self.msg.exec_()
 
     def removeSelectedSources(self):
         for item in self.items:
-            x = sourceslist.SourceEntry(str(item))
-            self.s.remove(x)
-            self.s.save()
-        self.close()
-        self.msg.exec_()
+            if item.checkState() == QtCore.Qt.Checked:
+                self.model.removeRow(item.row())
+                x = sourceslist.SourceEntry(str(item.text()))
+                self.s.remove(x)
+                self.s.save()
 
     def searchItem(self, model, view):
         search_string = self.searchEditText.text()
diff --git a/Resetter/usr/lib/resetter/Tools.py b/Resetter/usr/lib/resetter/Tools.py
index 603a872..d83ab0b 100644
--- a/Resetter/usr/lib/resetter/Tools.py
+++ b/Resetter/usr/lib/resetter/Tools.py
@@ -3,12 +3,12 @@
 # This class contains function tools that are often used by other classes, i
 
 
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 
 
 class UsefulTools(object):
     def __init__(self):
-        self.version = '2.2.0'
+        self.version = '2.2.1'
 
     def showMessage(self, title, message, icon, detail=None):  # Method for showing various message types to user
         self.msg = QtGui.QMessageBox()
@@ -24,4 +24,11 @@ def getVersion(self):  # version getter
 
     def lineCount(self, file_path):  # line counter
         lc = open(file_path).readlines()
-        return len(lc)
\ No newline at end of file
+        return len(lc)
+
+    def removeItems(self, model):
+        for row in xrange(model.rowCount()):
+            item = model.item(row)
+            if item and item.checkState() == QtCore.Qt.Checked:
+                model.removeRow(row)
+                self.removeItems()
\ No newline at end of file
diff --git a/Resetter/usr/lib/resetter/data/scripts/remove-old-kernels.sh b/Resetter/usr/lib/resetter/data/scripts/remove-old-kernels.sh
index c16732a..aff54b4 100644
--- a/Resetter/usr/lib/resetter/data/scripts/remove-old-kernels.sh
+++ b/Resetter/usr/lib/resetter/data/scripts/remove-old-kernels.sh
@@ -2,10 +2,10 @@
 #find old kernels
 
 kernels=("linux-image" "linux-headers" "linux-image-extra")
-for item in "${kernels[@]}"; 
-    do dpkg-query -W -f'${Package} ${Status}\n' "$item-[0-9]*.[0-9]*.[0-9]*" | 
+for item in "${kernels[@]}";
+    do dpkg-query -W -f'${Package} ${Status}\n' "$item-[0-9]*.[0-9]*.[0-9]*" 2>/dev/null|
     sort -V |
     awk '$NF == "installed"{print $1}'|
-    awk 'index($0,k){exit} //' k=$(uname -r | cut -d- -f1,2); 
+    awk 'index($0,k){exit} //' k=$(uname -r | cut -d- -f1,2);
 done
 
diff --git a/Resetter/usr/lib/resetter/data/userlists/LinuxMint18.3-default-userlistl b/Resetter/usr/lib/resetter/data/userlists/LinuxMint18.3-default-userlistl
new file mode 100644
index 0000000..aaa186c
--- /dev/null
+++ b/Resetter/usr/lib/resetter/data/userlists/LinuxMint18.3-default-userlistl
@@ -0,0 +1,41 @@
+root
+daemon
+bin
+sys
+sync
+games
+man
+lp
+mail
+news
+uucp
+proxy
+www-data
+backup
+list
+irc
+gnats
+nobody
+systemd-timesync
+systemd-network
+systemd-resolve
+systemd-bus-proxy
+syslog
+_apt
+messagebus
+uuidd
+lightdm
+ntp
+avahi-autoipd
+avahi
+dnsmasq
+colord
+geoclue
+speech-dispatcher
+hplip
+kernoops
+pulse
+nm-openvpn
+rtkit
+saned
+usbmux
diff --git a/Resetter/usr/share/doc/resetter/changelog.gz b/Resetter/usr/share/doc/resetter/changelog.gz
index e135cf1..b9c71ad 100644
Binary files a/Resetter/usr/share/doc/resetter/changelog.gz and b/Resetter/usr/share/doc/resetter/changelog.gz differ
diff --git a/_config.yml b/_config.yml
deleted file mode 100644
index c741881..0000000
--- a/_config.yml
+++ /dev/null
@@ -1 +0,0 @@
-theme: jekyll-theme-slate
\ No newline at end of file