#2354 - Theme updates