Fixes for the default theme