Checking in changes to support custom directory for themes