Move to single gif store (with properties for favorites and history)