BASIC-1022 BASIC-912

# Not Ready

* Added and updated all layouts, restored theme settings for style and font