Fixing CSS for default theme & CM4