BASIC-1022 BASIC-912 Added and updated all layouts, restored theme settings for style and font
Merge pull request #4 from SU-SWS/BASIC-912

BASIC-1022 BASIC-912