What do I need to extend my 30-day visa in Bangkok?

I had a 30 day visa when I landed, and am looking to extend 30 days. I am in Bangkok, will be going to the Chaengwattana immigration office I believe, unless there's a closer one to central Bangkok. Since I waited last minute and am in a rush, want to confirm this is all I need:

1. TM7 Extension of Temporary Stay form

1. A copy of your passport ID page

1. A copy of your entry stamp or a copy of your visa, if you entered with one.

1. A copy of your Thailand departure card or TM.6

1. Thai visa extension photo requirements:- 1 passport photo, 4x6cm

1. 1,900฿ fee for extension paid in cash

No need for TM30? And also all the forms and passport photos can be done at the immigration office? I remember there being a lot of small shops. So just bring myself, 1900 baht, and my passport?