Adding custom themes and built in server