Fixes for basic theme