Fixes format lists

TODO: This whole lists system needs work