final theme changes