Broken-Theme Fixes

Thanks.