some theme changes, tests added