MOAR fixes, multi-theme support is ready.