More conversions of with_imm_base to with_base
Add support for margins, borders, and padding