removed redundant "apptheme" in file names