diff --git a/plugins/channelrx/demodatv/atvdemodgui.ui b/plugins/channelrx/demodatv/atvdemodgui.ui
index f42c7fd7d..37a18c348 100644
--- a/plugins/channelrx/demodatv/atvdemodgui.ui
+++ b/plugins/channelrx/demodatv/atvdemodgui.ui
@@ -622,6 +622,11 @@
         <property name="toolTip">
          <string>Nominal number of lines per frame</string>
         </property>
+        <item>
+         <property name="text">
+          <string>819</string>
+         </property>
+        </item>
         <item>
          <property name="text">
           <string>640</string>
@@ -783,7 +788,7 @@
         </item>
         <item>
          <property name="text">
-          <string>PAL405</string>
+          <string>819L</string>
          </property>
         </item>
         <item>
diff --git a/plugins/channelrx/demodatv/atvdemodsettings.cpp b/plugins/channelrx/demodatv/atvdemodsettings.cpp
index 4134249ec..f8163992b 100644
--- a/plugins/channelrx/demodatv/atvdemodsettings.cpp
+++ b/plugins/channelrx/demodatv/atvdemodsettings.cpp
@@ -220,42 +220,45 @@ int ATVDemodSettings::getNumberOfLines(int nbLinesIndex)
     switch(nbLinesIndex)
     {
     case 0:
-        return 640;
-        break;
-    case 2:
-        return 525;
-        break;
-    case 3:
-        return 480;
-        break;
-    case 4:
-        return 405;
-        break;
-    case 5:
-        return 360;
-        break;
-    case 6:
-        return 343;
-        break;
-    case 7:
-        return 240;
-        break;
-    case 8:
-        return 180;
-        break;
-    case 9:
-        return 120;
-        break;
-    case 10:
-        return 90;
-        break;
-    case 11:
-        return 60;
-        break;
-    case 12:
-        return 32;
+        return 819;
         break;
     case 1:
+        return 640;
+        break;
+    case 3:
+        return 525;
+        break;
+    case 4:
+        return 480;
+        break;
+    case 5:
+        return 405;
+        break;
+    case 6:
+        return 360;
+        break;
+    case 7:
+        return 343;
+        break;
+    case 8:
+        return 240;
+        break;
+    case 9:
+        return 180;
+        break;
+    case 10:
+        return 120;
+        break;
+    case 11:
+        return 90;
+        break;
+    case 12:
+        return 60;
+        break;
+    case 13:
+        return 32;
+        break;
+    case 2:
     default:
         return 625;
         break;
@@ -265,29 +268,31 @@ int ATVDemodSettings::getNumberOfLines(int nbLinesIndex)
 int ATVDemodSettings::getNumberOfLinesIndex(int nbLines)
 {
     if (nbLines <= 32) {
-        return 12;
+        return 13;
     } else if (nbLines <= 60) {
-        return 11;
+        return 12;
     } else if (nbLines <= 90) {
-        return 10;
+        return 11;
     } else if (nbLines <= 120) {
-        return 9;
+        return 10;
     } else if (nbLines <= 180) {
-        return 8;
+        return 9;
     } else if (nbLines <= 240) {
-        return 7;
+        return 8;
     } else if (nbLines <= 343) {
-        return 6;
+        return 7;
     } else if (nbLines <= 360) {
-        return 5;
+        return 6;
     } else if (nbLines <= 405) {
-        return 4;
+        return 5;
     } else if (nbLines <= 480) {
-        return 3;
+        return 4;
     } else if (nbLines <= 525) {
-        return 2;
+        return 3;
     } else if (nbLines <= 625) {
-        return 1;
+        return 2;
+    } else if (nbLines <= 640) {
+        return 2;
     } else {
         return 0;
     }
diff --git a/plugins/channelrx/demodatv/atvdemodsettings.h b/plugins/channelrx/demodatv/atvdemodsettings.h
index 161037856..538a62ef1 100644
--- a/plugins/channelrx/demodatv/atvdemodsettings.h
+++ b/plugins/channelrx/demodatv/atvdemodsettings.h
@@ -39,7 +39,7 @@ struct ATVDemodSettings
     {
         ATVStdPAL625,
         ATVStdPAL525,
-        ATVStd405,
+        ATVStd819,
         ATVStdShortInterleaved,
         ATVStdShort,
         ATVStdHSkip
diff --git a/plugins/channelrx/demodatv/atvdemodsink.cpp b/plugins/channelrx/demodatv/atvdemodsink.cpp
index a50b89198..70ed65d8e 100644
--- a/plugins/channelrx/demodatv/atvdemodsink.cpp
+++ b/plugins/channelrx/demodatv/atvdemodsink.cpp
@@ -355,12 +355,12 @@ void ATVDemodSink::applyStandard(int sampleRate, const ATVDemodSettings& setting
         m_firstVisibleLine   = 3;
         m_numberSamplesHSyncCrop = (int) (0.085f * lineDuration * sampleRate); // 8.5% of full line empirically
         break;
-    case ATVDemodSettings::ATVStd405: // Follows loosely the 405 lines standard
+    case ATVDemodSettings::ATVStd819: // 819 lines standard F
         // what is left in a line for the image
         m_interleaved        = true;
-        m_numberOfVSyncLines = 3;
-        m_numberOfBlackLines = 30;
-        m_firstVisibleLine   = 13;
+        m_numberOfVSyncLines = 4;
+        m_numberOfBlackLines = 58;
+        m_firstVisibleLine   = 27;
         m_numberSamplesHSyncCrop = (int) (0.085f * lineDuration * sampleRate); // 8.5% of full line empirically
         break;
     case ATVDemodSettings::ATVStdPAL525: // Follows PAL-M standard