Rework on layout theme.