fixed theme support
added support for notes