Fix: Maches and texture fixes

Additional fixes and matches to the textures