Theme distance -1 functionality
Resolved merge conflict for Theme