diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt
index d17ad1693..18ad726df 100644
--- a/src/nhttpd/web/Y_Blocks.txt
+++ b/src/nhttpd/web/Y_Blocks.txt
@@ -506,8 +506,8 @@ start-block~remote
{=if-equal:{=var-get:boxtype=}~CST Neo CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~
{=if-equal:{=var-get:boxtype=}~CST Zee SAT~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~
{=if-equal:{=var-get:boxtype=}~CST Zee CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~
- {=if-equal:{=var-get:boxtype=}~CST Neo Twin SAT~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~ {=comment:todo! rc version 4 ~=}
- {=if-equal:{=var-get:boxtype=}~CST Neo Twin CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~ {=comment:todo! rc version 4 ~=}
+ {=if-equal:{=var-get:boxtype=}~CST Neo Twin SAT~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
+ {=if-equal:{=var-get:boxtype=}~CST Neo Twin CABLE~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}
@@ -518,7 +518,7 @@ start-block~remote
{=if-equal:{=var-get:yfbtype=}~1~ {=include-block:Y_Blocks.txt;rc_cst_v1=}~
{=if-equal:{=var-get:yfbtype=}~2~ {=include-block:Y_Blocks.txt;rc_cst_v2=}~
{=if-equal:{=var-get:yfbtype=}~3~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~
- {=if-equal:{=var-get:yfbtype=}~4~ {=include-block:Y_Blocks.txt;rc_cst_v3=}~ {=comment:todo! rc version 4 ~=}
+ {=if-equal:{=var-get:yfbtype=}~4~ {=include-block:Y_Blocks.txt;rc_cst_v4=}~
{=comment:fallback~=} {=include-block:Y_Blocks.txt;rc_cst_v1=}
=}=}=}=}=}=}
@@ -634,59 +634,95 @@ end-block~rc_cst_v2
# ------ Remote CST V3 (ZEE, NEO2)
start-block~rc_cst_v3
+{=var-set:rcu=rc_cst_v3=}
-
+{=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
end-block~rc_cst_v3
+# ------ Remote CST V4 (NEO TWIN)
+start-block~rc_cst_v4
+{=var-set:rcu=rc_cst_v4=}
+
+{=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
+end-block~rc_cst_v4
+
+# ------ Map for Remote CST V3 (ZEE, NEO2) and V4 (NEO TWIN)
+start-block~map_rc_cst_v3_v4
+
+end-block~map_rc_cst_v3_v4
+
# ------- Remote d-Box Nokia old
start-block~rc_dbox_nokia_old
diff --git a/src/nhttpd/web/Y_Main.css b/src/nhttpd/web/Y_Main.css
index 6a062e5e0..7f4f979a1 100644
--- a/src/nhttpd/web/Y_Main.css
+++ b/src/nhttpd/web/Y_Main.css
@@ -869,9 +869,13 @@ a.timer {
#screenshot_header {
height: 30px;
}
+td#remote,
td.shot {
vertical-align: top;
}
+td#remote img {
+ margin: 10px 10px 10px 0;
+}
img#shot {
width: 100%;
background-color: #ffffff;
diff --git a/src/nhttpd/web/images/Makefile.am b/src/nhttpd/web/images/Makefile.am
index c2cb4e513..99ad6eaab 100644
--- a/src/nhttpd/web/images/Makefile.am
+++ b/src/nhttpd/web/images/Makefile.am
@@ -67,6 +67,7 @@ install_DATA = accept.png \
rc_cst_v1.jpg \
rc_cst_v2.jpg \
rc_cst_v3.jpg \
+ rc_cst_v4.jpg \
rc_dbox_nokia_old.jpg \
rc_dbox_philips.jpg \
record.gif \
diff --git a/src/nhttpd/web/images/rc_cst_v3.jpg b/src/nhttpd/web/images/rc_cst_v3.jpg
index 7bbb8ae61..33aba320e 100644
Binary files a/src/nhttpd/web/images/rc_cst_v3.jpg and b/src/nhttpd/web/images/rc_cst_v3.jpg differ
diff --git a/src/nhttpd/web/images/rc_cst_v4.jpg b/src/nhttpd/web/images/rc_cst_v4.jpg
new file mode 100644
index 000000000..b52e6f1e0
Binary files /dev/null and b/src/nhttpd/web/images/rc_cst_v4.jpg differ
diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch
index 5afaea92f..f17d79614 100644
--- a/src/nhttpd/web/languages/Deutsch
+++ b/src/nhttpd/web/languages/Deutsch
@@ -538,3 +538,54 @@ info.About=Über
info.check_for_updates=Auf Updates prüfen
info.your_version=Deine Version
info.actual_version=Aktuelle Version
+
+=========Remote control
+rc.key_power=Standby - Schaltet den Receiver ein bzw. aus
+rc.key_mute=Mute - Schaltet den Ton an bzw. aus
+rc.key_1=1
+rc.key_2=2
+rc.key_3=3
+rc.key_4=4
+rc.key_5=5
+rc.key_6=6
+rc.key_7=7
+rc.key_8=8
+rc.key_9=9
+rc.key_0=0
+rc.key_text=Text - Zeigt den Teletext an
+rc.key_favorites=Favoriten - Zeigt die Favoritenliste an
+rc.key_volumeup=Vol+ - Erhöht die Lautstärke
+rc.key_volumedown=Vol- - Verringert die Lautstärke
+rc.key_pageup=Page+ - Blättert im Menü eine Seite hoch
+rc.key_pagedown=Page- - Blättert im Menü eine Seiter runter
+rc.key_mode=TV/Radio - Wechselt zwischen TV- und Radio-Modus
+rc.key_next=Skip- - Ändert das 4:3 Anzeigeverhalten
+rc.key_previous=Skip+ - Ändert das Bildschirmformat
+rc.key_sleep=Sleep - Setzt einen Ausschalt-Timer
+rc.key_audio=Audio - Startet den Audioplayer bzw. Internetradio
+rc.key_help=Help - Startet je nach Modus verschiedene Funktionen
+rc.key_red=Rot - Öffnet das Menü 'EPG/Vorschau'
+rc.key_green=Grün - Offnet das Menü 'Ton-Optionen'
+rc.key_yellow=Gelb - Öffnet das Menü 'Bild-Optionen' (wenn verfügbar)
+rc.key_blue=Blau - Öffnet das Menü 'Erweiterungen'
+rc.key_epg=EPG - Zeigt EPG-Informationen an
+rc.key_info=Info - Zeigt die Infobar und EPG-Beschreibung an
+rc.key_ok=OK - Bestätigt Auswahl im Menüfenster
+rc.key_up=Hoch - Programmwechsel und Menünavigation
+rc.key_down=Runter - Programmwechsel und Menünavigation
+rc.key_left=Links - Programmwechsel und Menünavigation
+rc.key_right=Rechts - Programmwechsel und Menünavigation
+rc.key_setup=Menü - Öffnet bzw. schließt das Hauptmenü
+rc.key_home=Exit - Schließt das geöffnete Menüfenster
+rc.key_sat=Sat - Öffnet Satelliten- bzw. Anbieterübersicht
+rc.key_www=
+rc.key_rewind=Rewind - Zurückspulen
+rc.key_play=Play - Öffnet das Filmarchiv oder startet die Wiedergabe
+rc.key_forward=Forward - Vorspulen
+rc.key_stop=Stop - Beendet Aufnahme, Timeshift oder Wiedergabe
+rc.key_record=Record - Startet Aufnahme
+rc.key_pause=Pause - Aktiviert timeshift oder pausiert die Wiedergabe
+rc.key_games=
+rc.key_time=
+rc.key_picsize=Pic Size - Ändert das 4:3 Anzeigeverhalten
+rc.key_picmode=Pic Mode - Ändert das Bildschirmformat
diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English
index a769bd57b..d9ae7c8d2 100644
--- a/src/nhttpd/web/languages/English
+++ b/src/nhttpd/web/languages/English
@@ -542,3 +542,53 @@ info.check_for_updates=Check for Updates
info.your_version=Your Version
info.actual_version=Actual Version
+=========Remote control
+rc.key_power=Standby
+rc.key_mute=Mute
+rc.key_1=1
+rc.key_2=2
+rc.key_3=3
+rc.key_4=4
+rc.key_5=5
+rc.key_6=6
+rc.key_7=7
+rc.key_8=8
+rc.key_9=9
+rc.key_0=0
+rc.key_text=Text
+rc.key_favorites=Favorites
+rc.key_volumeup=Vol+
+rc.key_volumedown=Vol-
+rc.key_pageup=Page+
+rc.key_pagedown=Page-
+rc.key_mode=TV/Radio
+rc.key_next=Skip-
+rc.key_previous=Skip+
+rc.key_sleep=Sleep
+rc.key_audio=Audio
+rc.key_help=Help
+rc.key_red=Red
+rc.key_green=Green
+rc.key_yellow=Yellow
+rc.key_blue=Blue
+rc.key_epg=EPG
+rc.key_info=Info
+rc.key_ok=OK
+rc.key_up=Up
+rc.key_down=Down
+rc.key_left=Left
+rc.key_right=Right
+rc.key_setup=Menu
+rc.key_home=Exit
+rc.key_sat=Sat
+rc.key_www=
+rc.key_rewind=Rewind
+rc.key_play=Play
+rc.key_forward=Forward
+rc.key_stop=Stop
+rc.key_record=Record
+rc.key_pause=Pause
+rc.key_games=
+rc.key_time=
+rc.key_picsize=Pic Size
+rc.key_picmode=Pic Mode