Fix theme name access
Fix styles
Merge