Updated to latest gradle
Fix build and don't overwrite styles when custom