Devel push to master its currently stable

added the two main themes to one massive one tied into the color module.