Fix lint errors
Cleanup code
Revert: Use dark theme
Updated buildToolsVersion
Updated to java version 1.8