Update theme to new format