Merge CM
Fixes, Theme stuff