Light+Dark Theme Fixes