multiple themes support & fixes