Part one of DB realignment. Bringing current with our 4.0.6a DB.

Signed-off-by: SkyFire <admin@projectskyfire.org>