Fix removal of "useless" stuff
Fix light theme issues