Remove theme selection feature which doesn't work
Small bug fix