control themes

Fix control themes