The Thai Embassy in Singapore has their own on line application method. I would say register and start applying while stil in Thailand and make an appointment to pick up when you actually are in Singapore.
Benefit is that you can e-mail if something is not understand. website