Revert "Revert "Osnoven Templejt""

This reverts commit 0dcc4aff23e89b25b1607bf1985da9e3092a3095.