Added FEPS 2.0 compatibility with specific themes