diff --git a/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp b/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp
index 0495cef..6294195 100644
--- a/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleBackup/Exporter.cpp
@@ -161,41 +161,17 @@ void WriteNorData()
 
     NN_LOG("Get NTR User Setting\n");
 
-    // ユーザカラー
-    result = nn::cfg::nor::CTR::GetUserColor(&s_NtrNorData.userColor);
-    if (result.IsSuccess())
-    {
-        NN_LOG("NTR User Color = %d\n", s_NtrNorData.userColor);
-    }
-    else
-    {
-        COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
-    }
-
-    // コメント
-    result = nn::cfg::nor::CTR::GetComment(&s_NtrNorData.comment);
-    if (result.IsSuccess())
-    {
-        NN_LOG("NTR User Comment = %ls\n", s_NtrNorData.comment.buffer);
-    }
-    else
-    {
-        COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
-    }
+    // NTR設定
+    result = nn::cfg::nor::CTR::GetNtrSetting(&s_NtrNorData.ntrConfig.ncd, &s_NtrNorData.ntrConfig.ncd_ex);
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     // TWL WiFi設定
     result = nn::cfg::nor::CTR::ReadTwlWifiSetting(0, s_NtrNorData.TwlWiFiSetting, common::TWL_WIFI_SETTING_SIZE);
-    if(result.IsFailure())
-    {
-        COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
-    }
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     // NTR WiFi設定
     result = nn::cfg::nor::CTR::ReadNtrWifiSetting(0, s_NtrNorData.NtrWiFiSetting, common::NTR_WIFI_SETTING_SIZE);
-    if(result.IsFailure())
-    {
-        COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
-    }
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     s_SdWriter.WriteBuf(common::NOR_PATHNAME, &s_NtrNorData, sizeof(common::NtrNorData));
 }
diff --git a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
index 2292f9a..35023e7 100644
--- a/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
+++ b/trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
@@ -515,36 +515,19 @@ void ImportNorData()
         if(result.IsSuccess())
         {
             // cfgを使ってセットする
-            // ユーザカラー
-            NN_LOG("user color = %d\n", (reinterpret_cast<common::NtrNorData*>(buf)->userColor));
-            result = nn::cfg::nor::CTR::SetUserColor(reinterpret_cast<common::NtrNorData*>(buf)->userColor);
-            if(result.IsFailure())
-            {
-                COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
-            }
-
-            // コメント
-            result = nn::cfg::nor::CTR::SetComment(reinterpret_cast<common::NtrNorData*>(buf)->comment);
-            if(result.IsFailure())
-            {
-                COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
-            }
+            result = nn::cfg::nor::CTR::SetNtrSetting(&reinterpret_cast<common::NtrNorData*>(buf)->ntrConfig.ncd,
+                    &reinterpret_cast<common::NtrNorData*>(buf)->ntrConfig.ncd_ex);
+            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
             // TWL WiFi設定
             result = nn::cfg::nor::CTR::WriteTwlWifiSetting(0, reinterpret_cast<common::NtrNorData*>(buf)->TwlWiFiSetting,
                     common::TWL_WIFI_SETTING_SIZE);
-            if (result.IsFailure())
-            {
-                COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
-            }
+            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
             // NTR WiFi設定
             result = nn::cfg::nor::CTR::WriteNtrWifiSetting(0, reinterpret_cast<common::NtrNorData*>(buf)->NtrWiFiSetting,
                     common::NTR_WIFI_SETTING_SIZE);
-            if (result.IsFailure())
-            {
-                COMMON_LOGGER_RESULT_WITH_LINE(result , __LINE__);
-            }
+            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
         }
         else
diff --git a/trunk/ConsoleDataMigration/common/CommonLogger.h b/trunk/ConsoleDataMigration/common/CommonLogger.h
index 3af1e2d..4018a3b 100644
--- a/trunk/ConsoleDataMigration/common/CommonLogger.h
+++ b/trunk/ConsoleDataMigration/common/CommonLogger.h
@@ -38,6 +38,11 @@
         COMMON_LOGGER_RESULT(result);            \
     }                                            \
 
+#define COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result)        \
+    if(result.IsFailure())                                       \
+    {                                                            \
+        COMMON_LOGGER_RESULT_WITH_LINE(result, __LINE__);        \
+    }                                                            \
 
 namespace common
 {
diff --git a/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp b/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp
index 63f53bd..8164695 100644
--- a/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp
+++ b/trunk/ConsoleDataMigration/common/SdReaderWriter.cpp
@@ -15,6 +15,7 @@
 
 #include "SdReaderWriter.h"
 #include "SdMountManager.h"
+#include "CommonLogger.h"
 
 namespace common
 {
@@ -58,10 +59,7 @@ nn::Result SdReaderWriter::WriteBuf(const wchar_t* path, void* buf, size_t size)
 
     nn::Result result;
     result = Initialize();
-    if(result.IsFailure())
-    {
-        nn::dbg::PrintResult(result);
-    }
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     result = file.TryInitialize(path, nn::fs::OPEN_MODE_WRITE | nn::fs::OPEN_MODE_CREATE);
     if (result.IsSuccess())
@@ -74,28 +72,25 @@ nn::Result SdReaderWriter::WriteBuf(const wchar_t* path, void* buf, size_t size)
             if (result.IsFailure())
             {
                 NN_LOG("SD TryFlush failed\n");
-                nn::dbg::PrintResult(result);
+                COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
             }
         }
         else
         {
             NN_LOG("SD TryWrite failed\n");
-            nn::dbg::PrintResult(result);
+            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
         }
     }
     else
     {
         NN_LOG("SD TryInitialize failed\n");
-        nn::dbg::PrintResult(result);
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
     }
 
     file.Finalize();
 
     result = Finalize();
-    if(result.IsFailure())
-    {
-        nn::dbg::PrintResult(result);
-    }
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     return result;
 }
@@ -120,23 +115,17 @@ nn::Result SdReaderWriter::ReadBuf(const wchar_t* path, void* buf, size_t size,
         {
             // TODO バッファを超えるサイズのファイル読み込み
             *totalSize = readSize;
-            result = file.TryFlush();
-            if (result.IsFailure())
-            {
-                NN_LOG("SD TryFlush failed\n");
-                nn::dbg::PrintResult(result);
-            }
         }
         else
         {
             NN_LOG("SD TryRead failed\n");
-            nn::dbg::PrintResult(result);
+            COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
         }
     }
     else
     {
         NN_LOG("SD TryInitialize failed\n");
-        nn::dbg::PrintResult(result);
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
     }
 
     file.Finalize();
@@ -154,12 +143,11 @@ void SdReaderWriter::CreateDirectory(const wchar_t* path)
 
     NN_LOG("Create Directory %ls\n", path);
     result = nn::fs::TryCreateDirectory(path);
-    if(result.IsFailure())
-    {
-        nn::dbg::PrintResult(result);
-    }
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+
+    result = Finalize();
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
-    Finalize();
 }
 
 }
diff --git a/trunk/ConsoleDataMigration/common/common_Types.h b/trunk/ConsoleDataMigration/common/common_Types.h
index dcba8bf..4a69164 100644
--- a/trunk/ConsoleDataMigration/common/common_Types.h
+++ b/trunk/ConsoleDataMigration/common/common_Types.h
@@ -28,12 +28,9 @@ const u32 TWL_WIFI_SETTING_SIZE             = 0x600;    // TWL Wifi 設定のサ
 // NOR領域のみにある設定データ用構造体
 struct NtrNorData
 {
-    nn::cfg::CTR::NtrComment comment;
+    nn::cfg::CTR::NtrConfig ntrConfig;
     u8 TwlWiFiSetting[TWL_WIFI_SETTING_SIZE];
     u8 NtrWiFiSetting[NTR_WIFI_SETTING_SIZE];
-    NN_PADDING1;
-    u8 userColor;
-
 };