Theming now works, will need to do some cleanup + restore work though.