Update theme loading and remove some cruft