Added 2 new custom themes and cleaned up JS code