change theme to strongly typed