Hotfix/real classic theme