Removed old stuff and add Matte to themes-base