refactoring theme code structure
syncing changes
updates