Fixing custom theme bugs