Some changes & cleanup
Push Launcher3 from Omnirom
Cleaned up the manifest for a more user-friendly