Somebody built a pretty nice gas tank that is "supposed" to be a 25 gallon tank, I haven't measured it out yet to verify but it is a pretty nice size whatever it is.
I have a new/used TJ fuel filler bezel and filler tube to update the original gas filler and tube.