Switch to new internal shell theming