Core pr 4

Updates to match the module to DDBasic theme design.