Fixes #186 Extend support for native themes.