MacOS Catalina keyboard layout

After Catalina upgrade I have noticed my keyboard layout is different. I was using Croatian (e.g. Y was Z, @ was opt+shift+2).

Now it is switched to "Croatian - PC" which resembles Windows keyboard layout (Y is still Z, @ is opt+v).

There is another option, which is "Croatian" and is similar to what I had before, but with some changes (Y is Y, @ is opt+2).

Is there a way without some external tool and re-mappings to revert my keyboard to what it was before?

I have put of copy of the Croatian layout from an earlier MacOS, named "Old Croatian", here and a copy of the Croatian PC layout here. Hopefully one of them will help.