diff --git a/Resources/Private/Language/de.locallang.xlf b/Resources/Private/Language/de.locallang.xlf
index 794ee72..e07ab4a 100644
--- a/Resources/Private/Language/de.locallang.xlf
+++ b/Resources/Private/Language/de.locallang.xlf
@@ -7,13 +7,25 @@
 				<source>Search form</source>
 				<target>Suchformular</target>
 			</trans-unit>
+			<trans-unit id="tx_events.searchform.searchword">
+				<source>Search word</source>
+				<target>Suchwort</target>
+			</trans-unit>
+			<trans-unit id="tx_events.searchform.date_from">
+				<source>Date from</source>
+				<target>Datum von</target>
+			</trans-unit>
+			<trans-unit id="tx_events.searchform.date_to">
+				<source>Date to</source>
+				<target>Date bis</target>
+			</trans-unit>
 			<trans-unit id="tx_events.searchform.regions">
 				<source>All regions</source>
-				<target>Alle Regionen</target>
+				<target>Alle Städte</target>
 			</trans-unit>
 			<trans-unit id="tx_events.searchform.search">
 				<source>Search</source>
-				<target>Suche</target>
+				<target>Suchen</target>
 			</trans-unit>
 		</body>
 	</file>
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index bee8485..ca11660 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -6,6 +6,15 @@
 			<trans-unit id="tx_events.searchform">
 				<source>Search form</source>
 			</trans-unit>
+			<trans-unit id="tx_events.searchform.searchword">
+				<source>Search word</source>
+			</trans-unit>
+			<trans-unit id="tx_events.searchform.date_from">
+				<source>Date from</source>
+			</trans-unit>
+			<trans-unit id="tx_events.searchform.date_to">
+				<source>Date to</source>
+			</trans-unit>
 			<trans-unit id="tx_events.searchform.regions">
 				<source>All regions</source>
 			</trans-unit>
diff --git a/Resources/Private/Partials/Date/~OBSOLETE-SearchForm.html b/Resources/Private/Partials/Date/~OBSOLETE-SearchForm.html
deleted file mode 100644
index f920cb8..0000000
--- a/Resources/Private/Partials/Date/~OBSOLETE-SearchForm.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{namespace wrm=Wrm\Events\ViewHelpers}
-<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
-
-<div class="row">
-    <div class="col-12 mb-5">
-        <!-- TODO bg color classes not loaded in scss -->
-            <f:form action="list" controller="Date" pluginName="DateList" method="get" addQueryString="1" id="events_search" name="events_search">
-
-                <div class="row">
-                    <div class="col">
-                        <div class="form-group">
-                            <label for="searchword">Suchwort</label>
-                            <f:form.textfield type="text" class="form-control" id="searchword" name="searchword" value="{searchword}" />
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row">
-                    <div class="col">
-                        <div class="form-group">
-                            <label for="start">Datum von</label>
-                            <div class="input-group date" id="date_start" data-target-input="nearest">
-                                <f:form.textfield type="text" class="form-control datetimepicker-input" id="start" name="start" value="{start}" additionalAttributes="{data-target: '#date_start'}" />
-                                <div class="input-group-append" data-target="#date_start" data-toggle="datetimepicker">
-                                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col">
-                        <div class="form-group">
-                            <label for="end">Datum bis</label>
-                            <div class="input-group date" id="date_end" data-target-input="nearest">
-                                <f:form.textfield type="text" class="form-control datetimepicker-input" id="start" name="end" value="{end}" additionalAttributes="{data-target: '#date_end'}" />
-                                <div class="input-group-append" data-target="#date_end" data-toggle="datetimepicker">
-                                    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="row">
-                    <div class="col-3">
-                        <div class="form-check">
-                            <f:form.radio class="form-check-input" name="region" value="{region.uid}" checked="{selRegion}==0" id="radio_0"/>
-                            <label class="form-check-label" for="radio_0">Alle Städte</label>
-                        </div>
-                    </div>
-
-                    <f:for each="{regions}" as="region">
-                        <div class="col-3">
-                            <div class="form-check">
-                                <f:form.radio class="form-check-input" name="region" value="{region.uid}" checked="{selRegion}=={region.uid}" id="radio_{region.uid}"/>
-                                <label class="form-check-label" for="radio_{region.uid}">{region.title}</label>
-                            </div>
-                        </div>
-                    </f:for>
-                </div>
-                <div class="form-group mt-3">
-                    <f:form.submit value="Suchen" class="btn btn-primary" />
-                </div>
-            </f:form>
-    </div>
-</div>
\ No newline at end of file
diff --git a/Resources/Private/Templates/Date/Search.html b/Resources/Private/Templates/Date/Search.html
index 8267fe0..156fa2b 100644
--- a/Resources/Private/Templates/Date/Search.html
+++ b/Resources/Private/Templates/Date/Search.html
@@ -7,7 +7,7 @@
                 <div class="row">
                     <div class="col">
                         <div class="form-group">
-                            <label for="searchword">Suchwort</label>
+                            <label for="searchword"><f:translate key="LLL:EXT:events/Resources/Private/Language/locallang.xlf:tx_events.searchform.searchword" /></label>
                             <f:form.textfield type="text" class="form-control" id="searchword" name="searchword" value="{searchword}" />
                         </div>
                     </div>
@@ -25,7 +25,7 @@
                 <div class="row">
                     <div class="col col-md-6">
                         <div class="form-group">
-                            <label for="start">Datum von</label>
+                            <label for="start"><f:translate key="LLL:EXT:events/Resources/Private/Language/locallang.xlf:tx_events.searchform.date_from" /></label>
                             <div class="input-group date" id="date_start" data-target-input="nearest">
                                 <f:form.textfield type="text" class="form-control datetimepicker-input" id="start" name="start" value="{start}" additionalAttributes="{data-target: '#date_start'}" />
                                 <div class="input-group-append" data-target="#date_start" data-toggle="datetimepicker">
@@ -36,7 +36,7 @@
                     </div>
                     <div class="col col-md-6">
                         <div class="form-group">
-                            <label for="end">Datum bis</label>
+                            <label for="end"><f:translate key="LLL:EXT:events/Resources/Private/Language/locallang.xlf:tx_events.searchform.date_to" /></label>
                             <div class="input-group date" id="date_end" data-target-input="nearest">
                                 <f:form.textfield type="text" class="form-control datetimepicker-input" id="start" name="end" value="{end}" additionalAttributes="{data-target: '#date_end'}" />
                                 <div class="input-group-append" data-target="#date_end" data-toggle="datetimepicker">
@@ -51,7 +51,7 @@
                         <div class="col-4 col-md-3 col-lg-3">
                             <div class="form-check">
                                 <f:form.radio class="form-check-input" name="region" value="{region.uid}" checked="{selRegion}==0" id="radio_0"/>
-                                <label class="form-check-label" for="radio_0">Alle Städte</label>
+                                <label class="form-check-label" for="radio_0"><f:translate key="LLL:EXT:events/Resources/Private/Language/locallang.xlf:tx_events.searchform.regions" /></label>
                             </div>
                         </div>
 
@@ -66,7 +66,7 @@
                     </div>
                 </f:if>
                 <div class="form-group mt-3">
-                    <f:form.submit value="Suchen" class="btn btn-primary" />
+                    <f:form.submit value="{f:translate(key: 'LLL:EXT:events/Resources/Private/Language/locallang.xlf:tx_events.searchform.search')}" class="btn btn-primary" />
                 </div>
             </f:form>
         </div>
