Implementation of the new api and beginning of transition to new theme