Royal Navy and Royal Marines badges of rank

I am about to start painting some officers so needed to find out about rank badges.

This is for the Royal Navy:

http://www.royal-navy.mod.uk/server/show/nav.3761

This is for the Royal Marines:

http://www.royal-navy.mod.uk/server/show/nav.00h001004001009

These are the modern ones but I don't expect they have changed that much!