Fixing Theme Check issues