Fix functions for theming
Simplify plugin page
Introduce theme page