First working version of the new theme functionnality

Now refactoring and cleaning up