Added Option for NoTouch and ClassicHome as Default. Some Bugfixes.