More Theme Fixes