merge cyanogenmod
new themes