Revert colours, update to work with Android Studio 1.0.2