Made adjustments with a working theme.