I do both. I put my fabric together by themes: i.e.: NFL, MLB, Christmas, Halloween/Thanksgiving, Kids. Anything that does not fit within those themes get separated by color. If there are multiple colors in a piece of fabric I try to decide on the dominant color.