GPII-162: Focus styling tweaks and theming