diff --git a/DMRDMOTX.cpp b/DMRDMOTX.cpp
index b0175c8..476fd42 100644
--- a/DMRDMOTX.cpp
+++ b/DMRDMOTX.cpp
@@ -41,6 +41,12 @@ const q15_t DMR_LEVELB =  963;
 const q15_t DMR_LEVELC = -963;
 const q15_t DMR_LEVELD = -2889;
 
+// The PR FILL and Data Sync pattern.
+const uint8_t IDLE_DATA[] =
+        {0x53U, 0xC2U, 0x5EU, 0xABU, 0xA8U, 0x67U, 0x1DU, 0xC7U, 0x38U, 0x3BU, 0xD9U,
+         0x36U, 0x00U, 0x0DU, 0xFFU, 0x57U, 0xD7U, 0x5DU, 0xF5U, 0xD0U, 0x03U, 0xF6U,
+         0xE4U, 0x65U, 0x17U, 0x1BU, 0x48U, 0xCAU, 0x6DU, 0x4FU, 0xC6U, 0x10U, 0xB4U};
+
 const uint8_t CACH_INTERLEAVE[] =
       {1U,   2U,  3U,  5U,  6U,  7U,  9U, 10U, 11U, 13U, 15U, 16U, 17U, 19U, 20U, 21U, 23U,
        25U, 26U, 27U, 29U, 30U, 31U, 33U, 34U, 35U, 37U, 39U, 40U, 41U, 43U, 44U, 45U, 47U,
@@ -65,6 +71,7 @@ m_poBuffer(),
 m_poLen(0U),
 m_poPtr(0U),
 m_txDelay(240U),      // 200ms
+m_idle(),
 m_cachPtr(0U)
 {
   ::memset(m_modState, 0x00U, 16U * sizeof(q15_t));
@@ -84,11 +91,15 @@ void CDMRDMOTX::process()
 
       m_poLen = m_txDelay;
     } else {
-      createCACH(m_poBuffer + 0U,  0U);
+      createCACH(m_poBuffer + 0U, 0U);
+
+      for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
+        m_poBuffer[i + 3U] = m_fifo.get();
+
       createCACH(m_poBuffer + 36U, 1U);
 
       for (unsigned int i = 0U; i < DMR_FRAME_LENGTH_BYTES; i++)
-        m_poBuffer[i + 3U] = m_poBuffer[i + 39U] = m_fifo.get();
+        m_poBuffer[i + 39U] = m_idle[i];
 
       m_poLen = 72U;
     }
@@ -203,3 +214,12 @@ void CDMRDMOTX::createCACH(uint8_t* buffer, uint8_t slotIndex)
 
   m_cachPtr += 3U;
 }
+
+void CDMRDMOTX::setColorCode(uint8_t colorCode)
+{
+  ::memcpy(m_idle, IDLE_DATA, DMR_FRAME_LENGTH_BYTES);
+
+  CDMRSlotType slotType;
+  slotType.encode(colorCode, DT_IDLE, m_idle);
+}
+
diff --git a/DMRDMOTX.h b/DMRDMOTX.h
index 98ffdb0..2e49ff7 100644
--- a/DMRDMOTX.h
+++ b/DMRDMOTX.h
@@ -37,8 +37,9 @@ public:
 
   uint8_t getSpace() const;
 
-private:
+  void setColorCode(uint8_t colorCode);
 
+private:
   CSerialRB                        m_fifo;
   arm_fir_interpolate_instance_q15 m_modFilter;
   q15_t                            m_modState[16U];    // blockSize + phaseLength - 1, 4 + 9 - 1 plus some spare
@@ -46,6 +47,7 @@ private:
   uint16_t                         m_poLen;
   uint16_t                         m_poPtr;
   uint32_t                         m_txDelay;
+  uint8_t                          m_idle[DMR_FRAME_LENGTH_BYTES];
   uint8_t                          m_cachPtr;
 
   void createCACH(uint8_t* buffer, uint8_t slotIndex);
diff --git a/SerialPort.cpp b/SerialPort.cpp
index fd2678f..75b99b3 100644
--- a/SerialPort.cpp
+++ b/SerialPort.cpp
@@ -273,6 +273,7 @@ uint8_t CSerialPort::setConfig(const uint8_t* data, uint8_t length)
   dmrTX.setColorCode(colorCode);
   dmrRX.setColorCode(colorCode);
   dmrRX.setDelay(dmrDelay);
+  dmrDMOTX.setColorCode(colorCode);
   dmrDMORX.setColorCode(colorCode);
   dmrIdleRX.setColorCode(colorCode);
 
diff --git a/YSFTX.cpp b/YSFTX.cpp
index a5a8b92..25ed282 100644
--- a/YSFTX.cpp
+++ b/YSFTX.cpp
@@ -37,15 +37,15 @@ static q15_t YSF_C4FSK_FILTER[] = {0, 0, 0, 0, 401, 104, -340, -731, -847, -553,
 const uint16_t YSF_C4FSK_FILTER_PHASE_LEN = 9U;                       // phaseLength = numTaps/L
 #endif
 
-const q15_t YSF_LEVELA_HI =  3900;
-const q15_t YSF_LEVELB_HI =  1300;
-const q15_t YSF_LEVELC_HI = -1300;
-const q15_t YSF_LEVELD_HI = -3900;
+const q15_t YSF_LEVELA_HI =  3510;
+const q15_t YSF_LEVELB_HI =  1170;
+const q15_t YSF_LEVELC_HI = -1170;
+const q15_t YSF_LEVELD_HI = -3510;
 
-const q15_t YSF_LEVELA_LO =  1950;
-const q15_t YSF_LEVELB_LO =  650;
-const q15_t YSF_LEVELC_LO = -650;
-const q15_t YSF_LEVELD_LO = -1950;
+const q15_t YSF_LEVELA_LO =  1755;
+const q15_t YSF_LEVELB_LO =  585;
+const q15_t YSF_LEVELC_LO = -585;
+const q15_t YSF_LEVELD_LO = -1755;
 
 const uint8_t YSF_START_SYNC = 0x77U;
 const uint8_t YSF_END_SYNC   = 0xFFU;