Core/Items: Refactored ItemTemplate