Added missing tag replacement
Added own class for stunden