Fixing the Framework  theme changes issue