cleaning up themes logic, start working on the popup window to select theme