Updated theme naming conventions and modified code formatting