re arranging all the theme files and about to start getting stuck into flego