Tdh merged 2

Yeah, I'm fine with using 12/15/18/21 across the app instead of 14/18/21.