minor theme changes and test markup added