More theming fixes

No we aren't done yet

I can't even build on my laptop so testing commits isn't something I can do now

I will just push random commits till it clicks lol
:

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>