move nested theme declarations to within parent rule