BASIC-1022 BASIC-912 Added and updated all layouts, restored theme setti...

...ngs for style and font