Feature/theme improvements