Better implementation of basic theme editing