Organize styles into theme -> "AppTheme"
Merge remote-tracking branch 'origin/master'