more cleanup, moved some files to skin_default