update for better theming