remove unused Theme.find and make code more readable(?)