5 icon docks and MobileMusicPlayer Flip on Firmware 2.1.2

I have been waiting to buy an iPod Touch G2 for a while now because I will not buy it unless it is jailbroken... However, there are only two things that I want from a Jailbreak: One of them being a 5 icon dock and the other being is being able to merge the Music and Videos icons into one icon like on the iPhone.