=== modified file '3d-viewer/3d_frame.cpp'
--- 3d-viewer/3d_frame.cpp	2015-03-28 11:33:56 +0000
+++ 3d-viewer/3d_frame.cpp	2015-03-28 20:48:24 +0000
@@ -50,6 +50,14 @@
 static const wxChar keyBgColor_Green_Top[] =    wxT( "BgColor_Green_Top" );
 static const wxChar keyBgColor_Blue_Top[] =     wxT( "BgColor_Blue_Top" );
 
+static const wxChar keySMaskColor_Red_Top[] =   wxT( "SMaskColor_Red_Top" );
+static const wxChar keySMaskColor_Green_Top[] = wxT( "SMaskColor_Green_Top" );
+static const wxChar keySMaskColor_Blue_Top[] =  wxT( "SMaskColor_Blue_Top" );
+
+static const wxChar keySilkColor_Red_Top[] =    wxT( "SilkColor_Red_Top" );
+static const wxChar keySilkColor_Green_Top[] =  wxT( "SilkColor_Green_Top" );
+static const wxChar keySilkColor_Blue_Top[] =   wxT( "SilkColor_Blue_Top" );
+
 static const wxChar keyShowRealisticMode[] =    wxT( "ShowRealisticMode" );
 static const wxChar keyRenderShadows[] =        wxT( "Render_Shadows" );
 static const wxChar keyRenderRemoveHoles[] =    wxT( "Render_RemoveHoles" );
@@ -236,6 +244,14 @@
     aCfg->Read( keyBgColor_Green_Top, &GetPrm3DVisu().m_BgColor_Top.m_Green, 0.8 );
     aCfg->Read( keyBgColor_Blue_Top, &GetPrm3DVisu().m_BgColor_Top.m_Blue, 0.9 );
 
+    aCfg->Read( keySMaskColor_Red_Top, &GetPrm3DVisu().m_SolderMaskColor.m_Red, 100.0*(0.2/255.0) );
+    aCfg->Read( keySMaskColor_Green_Top, &GetPrm3DVisu().m_SolderMaskColor.m_Green, 255.0*(0.2/255.0) );
+    aCfg->Read( keySMaskColor_Blue_Top, &GetPrm3DVisu().m_SolderMaskColor.m_Blue, 180.0*(0.2/255.0) );
+
+    aCfg->Read( keySilkColor_Red_Top, &GetPrm3DVisu().m_SilkScreenColor.m_Red, 0.9 );
+    aCfg->Read( keySilkColor_Green_Top, &GetPrm3DVisu().m_SilkScreenColor.m_Green, 0.9 );
+    aCfg->Read( keySilkColor_Blue_Top, &GetPrm3DVisu().m_SilkScreenColor.m_Blue, 0.9 );
+
     bool tmp;
     aCfg->Read( keyShowRealisticMode, &tmp, false );
     prms.SetFlag( FL_USE_REALISTIC_MODE, tmp );
@@ -315,6 +331,14 @@
     aCfg->Write( keyBgColor_Green_Top, GetPrm3DVisu().m_BgColor_Top.m_Green );
     aCfg->Write( keyBgColor_Blue_Top, GetPrm3DVisu().m_BgColor_Top.m_Blue );
 
+    aCfg->Write( keySMaskColor_Red_Top, GetPrm3DVisu().m_SolderMaskColor.m_Red );
+    aCfg->Write( keySMaskColor_Green_Top, GetPrm3DVisu().m_SolderMaskColor.m_Green );
+    aCfg->Write( keySMaskColor_Blue_Top, GetPrm3DVisu().m_SolderMaskColor.m_Blue );
+
+    aCfg->Write( keySilkColor_Red_Top, GetPrm3DVisu().m_SilkScreenColor.m_Red );
+    aCfg->Write( keySilkColor_Green_Top, GetPrm3DVisu().m_SilkScreenColor.m_Green );
+    aCfg->Write( keySilkColor_Blue_Top, GetPrm3DVisu().m_SilkScreenColor.m_Blue );
+
     aCfg->Write( keyShowRealisticMode, prms.GetFlag( FL_USE_REALISTIC_MODE ) );
 
     aCfg->Write( keyRenderShadows, prms.GetFlag( FL_RENDER_SHADOWS ) );
@@ -478,6 +502,16 @@
         Get3DColorFromUser( GetPrm3DVisu().m_BgColor_Top );
         return;
 
+    case ID_MENU3D_SILKSCREEN_COLOR_SELECTION:
+        Get3DColorFromUser( GetPrm3DVisu().m_SilkScreenColor );
+        NewDisplay(GL_ID_TECH_LAYERS);
+        return;
+
+    case ID_MENU3D_SOLDERMASK_COLOR_SELECTION:
+        Get3DColorFromUser( GetPrm3DVisu().m_SolderMaskColor );
+        NewDisplay(GL_ID_TECH_LAYERS);
+        return;
+
     case ID_MENU3D_REALISTIC_MODE:
         GetPrm3DVisu().SetFlag( FL_USE_REALISTIC_MODE, isChecked );
         NewDisplay();

=== modified file '3d-viewer/3d_toolbar.cpp'
--- 3d-viewer/3d_toolbar.cpp	2015-03-28 11:33:56 +0000
+++ 3d-viewer/3d_toolbar.cpp	2015-03-28 20:32:16 +0000
@@ -205,6 +205,12 @@
     AddMenuItem( backgrounColorMenu, ID_MENU3D_BGCOLOR_SELECTION,
                  _( "Background Bottom Color" ), KiBitmap( palette_xpm ) );
 
+    AddMenuItem( backgrounColorMenu, ID_MENU3D_SILKSCREEN_COLOR_SELECTION,
+                 _( "Silkscreen Color" ), KiBitmap( palette_xpm ) );
+
+    AddMenuItem( backgrounColorMenu, ID_MENU3D_SOLDERMASK_COLOR_SELECTION,
+                 _( "Solder Mask Color" ), KiBitmap( palette_xpm ) );
+
     AddMenuItem( prefsMenu, ID_MENU3D_AXIS_ONOFF,
                  _( "Show 3D &Axis" ), KiBitmap( axis3d_front_xpm ), wxITEM_CHECK );
 

=== modified file '3d-viewer/3d_viewer_id.h'
--- 3d-viewer/3d_viewer_id.h	2015-03-28 11:33:56 +0000
+++ 3d-viewer/3d_viewer_id.h	2015-03-28 20:32:53 +0000
@@ -33,6 +33,8 @@
     ID_MENU3D_COLOR,
     ID_MENU3D_BGCOLOR_SELECTION,
     ID_MENU3D_BGCOLOR_TOP_SELECTION,
+    ID_MENU3D_SILKSCREEN_COLOR_SELECTION,
+    ID_MENU3D_SOLDERMASK_COLOR_SELECTION,
     ID_MENU3D_USE_COPPER_THICKNESS,
     ID_MENU3D_AXIS_ONOFF,
     ID_MENU3D_MODULE_ONOFF,

=== modified file '3d-viewer/info3d_visu.cpp'
--- 3d-viewer/info3d_visu.cpp	2015-03-28 11:33:56 +0000
+++ 3d-viewer/info3d_visu.cpp	2015-03-28 21:46:06 +0000
@@ -74,20 +74,6 @@
     m_CopperColor.m_Green = 223.0*LUMINANCE;
     m_CopperColor.m_Blue = 0.0*LUMINANCE;
 
-    // Set the solder mask color, in realistic mode
-    #undef LUMINANCE
-    #define LUMINANCE 0.2/255.0
-    m_SolderMaskColor.m_Red = 100.0*LUMINANCE;
-    m_SolderMaskColor.m_Green = 255.0*LUMINANCE;
-    m_SolderMaskColor.m_Blue = 180.0*LUMINANCE;
-
-    // Set the silk screen mask color, in realistic mode
-    #undef LUMINANCE
-    #define LUMINANCE 0.9
-    m_SilkScreenColor.m_Red = 1.0*LUMINANCE;
-    m_SilkScreenColor.m_Green = 1.0*LUMINANCE;
-    m_SilkScreenColor.m_Blue = 1.0*LUMINANCE;
-
     // Set the body board (FR4) color, in realistic mode
     #undef LUMINANCE
     #define LUMINANCE 0.2/255.0