Shelves or for myself wht I prefer ( and slowly working towards) is the plastic drawers they have now.. The totes clear or otherwise just didnt work for me. I hated that I had to move them around and stack and restack to see what I had.. with the drawers I fold the fabric into small enough to stand on end... then I simply pull out a drawer and can see what I have, and they stay dust free.
I prefer to separate my fabric by holiday, then color. If I happen to have bought a "collection" I do try to keep those together.