Reversed some changes that broke the theme

* Reverted changes from 8962583eb2b7138b5d8a82b88bbe92311b1aac30 that broke the theme
* @eyedol, double check those updates