Added start of placing logic
Refactored Themes.pm