You are somewhere in the mid to high teens. You got fat before because you weren't strong. Deadlift 230 kg, bench 125 kg, press 90 kg, and squat 200 kg and you won't gain mostly fat. Those macros are a good baseline to start with. When you get stuck add more carbs and keep working.