Mostly did some refactoring in StylesActivity and StylableApi