Fix Forms new theme