Fixed primary text colors
Removed redundant layout files
Merge remote-tracking branch 'origin/master'