Fantastic! This is pretty much exactly what I've been looking for, thank you so much!
Not to look a gift horse in the mouth, but on the nice-to-have would be rank insignia, at least on the TOS uniforms? Not really a big deal though. Still fantastic work. :D