Updated tests.
Add beginnings of theming.