Had no idea the previous commits did not include all files. Sorry. Fixed :)....

Had no idea the previous commits did not include all files. Sorry. Fixed :). Also rewritten the way SharedPrefs are stored. Should fix a few bugs.