Block & Theme Fixes