Nice upgrade. Are you sure you want the new tank near those two windows? Heat and light issues aside, if you ever need to service those windows, you'll end up draining the entire tank to move it. Personally, I'd put it against a blank wall if you can.