theme changes to support both themes