Fixing several of the backlogged theme issues