Yes, the software has been updated to reflect the Nonbusiness Energy Property Credit which was added back as an extender to tax year 2017 by the legislation passed and signed into law in February 2018.
See IRS Form 5695 - <a rel="nofollow" target="_blank" href="
https://www.irs.gov/pub/irs-pdf/f5695.pdf">https://www.irs.gov/pub/irs-pdf/f5695.pdf</a>
All the boxes shown on the screen "Tell Us How Much You Paid for Energy-Saving Improvements" are for the Nonbusiness Energy Property Credit. Enter your cost for the water heater in the box "Energy-Efficient Building Property" as previously stated in the Answer.
