Back to default branch for themes

The problem was the fact i was so far behind on upstream updates from cm, for settings and frameworks/base. At least I hope that was the problem lol