Added shop type

Also fixed a bug with gear penalty/bonuses and updated card styles