moved some files to theme