diff --git a/Catalog.sln b/Catalog.sln
index f35225c..9e1b1a9 100644
--- a/Catalog.sln
+++ b/Catalog.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ImageCatalog 2", "imagecatalog\ImageCatalog 2.vbproj", "{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}"
 EndProject
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPFCatalog", "WPFCatalog\WP
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "CatalogVbLib", "CatalogVbLib\CatalogVbLib.vbproj", "{44465926-240D-473F-90B8-786BA4384406}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaddoLibrary.WPF.NET46", "MaddoLibrary\MaddoLibrary.WPF.NET46\MaddoLibrary.WPF.NET46.csproj", "{73DA19D7-196D-4B16-B610-93250978A607}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -67,6 +69,18 @@ Global
 		{44465926-240D-473F-90B8-786BA4384406}.Release|Any CPU.Build.0 = Release|Any CPU
 		{44465926-240D-473F-90B8-786BA4384406}.Release|x64.ActiveCfg = Release|Any CPU
 		{44465926-240D-473F-90B8-786BA4384406}.Release|x86.ActiveCfg = Release|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Debug|x64.Build.0 = Debug|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Debug|x86.Build.0 = Debug|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Release|Any CPU.Build.0 = Release|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Release|x64.ActiveCfg = Release|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Release|x64.Build.0 = Release|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Release|x86.ActiveCfg = Release|Any CPU
+		{73DA19D7-196D-4B16-B610-93250978A607}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CatalogLib/CatalogLib.csproj b/CatalogLib/CatalogLib.csproj
index 9c15f91..f3a34a3 100644
--- a/CatalogLib/CatalogLib.csproj
+++ b/CatalogLib/CatalogLib.csproj
@@ -35,6 +35,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -57,6 +61,12 @@
       <Name>CatalogVbLib</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Settings\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CatalogLib/ImageCreator.cs b/CatalogLib/ImageCreator.cs
index 0b5ab67..82c6632 100644
--- a/CatalogLib/ImageCreator.cs
+++ b/CatalogLib/ImageCreator.cs
@@ -11,508 +11,508 @@ using CatalogVbLib;
 
 namespace CatalogLib
 {
-    public class ImageCreator
-    {
+	public class ImageCreator
+	{
 
-        #region Variabili
+		#region Variabili
 
-        private SinglePicData _singlePicData;
-        private PicSettings _picSettings;
+		private SinglePicData _singlePicData;
+		private PicSettings _picSettings;
 
-        private Rotazione _rotation;
+		private Rotazione _rotation;
 
-        //private bool FotoRuotaADestra = false;
+		//private bool FotoRuotaADestra = false;
 
-        //private bool FotoRuotaASinistra = false;
-        private string TempMinText = "";
-        //Private crFont1 As Font
+		//private bool FotoRuotaASinistra = false;
+		private string TempMinText = "";
+		//Private crFont1 As Font
 
-        private string _NomeFileChild;
-        private DirectoryInfo _SourceDir;
-        private DirectoryInfo _DestDirStart;
+		private string _NomeFileChild;
+		private DirectoryInfo _SourceDir;
+		private DirectoryInfo _DestDirStart;
 
-        private DirectoryInfo _DestDir;
+		private DirectoryInfo _DestDir;
 
-        private FileInfo _workFile;
-        private string testoFirma;
-        private string testoFirmaV;
-        private int alphaScelta;
-        private int _dimensioneStandard;
-        private int _dimensioneStandardMiniatura;
-        private DateTime dataFoto;
-        private DateTime dataPartenzaI;
-        private string testoOrario;
-        private string testoFirmaPiccola;
-        private Size thumbSizeSmall;
-        private Size thumbSizeBig;
-        private string nomeFileSmall;
-        private string nomeFileBig;
+		private FileInfo _workFile;
+		private string testoFirma;
+		private string testoFirmaV;
+		private int alphaScelta;
+		private int _dimensioneStandard;
+		private int _dimensioneStandardMiniatura;
+		private DateTime dataFoto;
+		private DateTime dataPartenzaI;
+		private string testoOrario;
+		private string testoFirmaPiccola;
+		private Size thumbSizeSmall;
+		private Size thumbSizeBig;
+		private string nomeFileSmall;
+		private string nomeFileBig;
 
-        private string nomeFileBig2;
-        private float yPosFromBottom;
-        private float yPosFromBottom1;
-        private float yPosFromBottom2;
-        private float yPosFromBottom3;
-        private float yPosFromBottom4;
+		private string nomeFileBig2;
+		private float yPosFromBottom;
+		private float yPosFromBottom1;
+		private float yPosFromBottom2;
+		private float yPosFromBottom3;
+		private float yPosFromBottom4;
 
-        public string NomeFileChild
-        {
-            get { return _NomeFileChild; }
-            set { _NomeFileChild = value; }
-        }
+		public string NomeFileChild
+		{
+			get { return _NomeFileChild; }
+			set { _NomeFileChild = value; }
+		}
 
-        public DirectoryInfo DestDirStart
-        {
-            get { return _DestDirStart; }
-            set { _DestDirStart = value; }
-        }
+		public DirectoryInfo DestDirStart
+		{
+			get { return _DestDirStart; }
+			set { _DestDirStart = value; }
+		}
 
-        public DirectoryInfo SourceDir
-        {
-            get { return _SourceDir; }
-            set { _SourceDir = value; }
-        }
+		public DirectoryInfo SourceDir
+		{
+			get { return _SourceDir; }
+			set { _SourceDir = value; }
+		}
 
-        public DirectoryInfo DestDir
-        {
-            get { return _DestDir; }
-            set { _DestDir = value; }
-        }
+		public DirectoryInfo DestDir
+		{
+			get { return _DestDir; }
+			set { _DestDir = value; }
+		}
 
-        public FileInfo WorkFile
-        {
-            get { return _workFile; }
-            set { _workFile = value; }
-        }
+		public FileInfo WorkFile
+		{
+			get { return _workFile; }
+			set { _workFile = value; }
+		}
 
-        #endregion
+		#endregion
 
-        //public ImageCreator(string nomeFileChild, DirectoryInfo sourceDir, DirectoryInfo destDir, DirectoryInfo destDirStart)
-        //{
-        //    this.NomeFileChild = nomeFileChild;
-        //    SourceDir = sourceDir;
-        //    DestDir = destDir;
-        //    DestDirStart = destDirStart;
-        //    WorkFile = new FileInfo(nomeFileChild);
-        //}
+		//public ImageCreator(string nomeFileChild, DirectoryInfo sourceDir, DirectoryInfo destDir, DirectoryInfo destDirStart)
+		//{
+		//    this.NomeFileChild = nomeFileChild;
+		//    SourceDir = sourceDir;
+		//    DestDir = destDir;
+		//    DestDirStart = destDirStart;
+		//    WorkFile = new FileInfo(nomeFileChild);
+		//}
 
-        //public ImageCreator(string nomeFileChild, DirectoryInfo sourceDir, DirectoryInfo destDir)
-        //{
-        //    NomeFileChild = nomeFileChild;
-        //    DestDir = destDir;
-        //}
+		//public ImageCreator(string nomeFileChild, DirectoryInfo sourceDir, DirectoryInfo destDir)
+		//{
+		//    NomeFileChild = nomeFileChild;
+		//    DestDir = destDir;
+		//}
 
-        //public ImageCreator(FileInfo file, DirectoryInfo destination)
-        //{
-        //    WorkFile = file;
-        //    DestDir = destination;
-        //}
+		//public ImageCreator(FileInfo file, DirectoryInfo destination)
+		//{
+		//    WorkFile = file;
+		//    DestDir = destination;
+		//}
 
-        public ImageCreator(SinglePicData picData, PicSettings picSettings)
-        {
-            
-        }
+		public ImageCreator(SinglePicData picData, PicSettings picSettings)
+		{
+			
+		}
 
-        /// <summary>
-        /// Elabora l'immagine
-        /// </summary>
-        /// <param name="info">Non ne ho idea. ToDo: capire a che serve</param>
-        public void CreaImmagineThread(string info)
-        {
+		/// <summary>
+		/// Elabora l'immagine
+		/// </summary>
+		/// <param name="info">Non ne ho idea. ToDo: capire a che serve</param>
+		public void CreaImmagineThread(string info)
+		{
 
-            //CatalogLib.PicSettings ps = new CatalogLib.PicSettings();
+			//CatalogLib.PicSettings ps = new CatalogLib.PicSettings();
 
-            PreparaVariabili();
+			PreparaVariabili();
 
-            // Workfile deve essere impostato esternamente. ToDo: passarlo come parametro così da potere riutilizzare la classe senza eliminarla e ricrearla
-            Image g = Image.FromFile(WorkFile.FullName);
+			// Workfile deve essere impostato esternamente. ToDo: passarlo come parametro così da potere riutilizzare la classe senza eliminarla e ricrearla
+			Image g = Image.FromFile(WorkFile.FullName);
 
-            ImpostaTestoExtra(g);
+			ImpostaTestoExtra(g);
 
-            // Rotazione immagine in base ai dati EXIF
-            Rotation(ref g);
+			// Rotazione immagine in base ai dati EXIF
+			Rotation(ref g);
 
-            // Impostazione del formato
-            // todo: mettere una selezione più specifica invece di assumere jpg
-            ImageFormat currentFormat = g.RawFormat;
-            if (_picSettings.UsaForzaJpg)
-            {
-                currentFormat = ImageFormat.Jpeg;
-            }
+			// Impostazione del formato
+			// todo: mettere una selezione più specifica invece di assumere jpg
+			ImageFormat currentFormat = g.RawFormat;
+			if (_picSettings.UsaForzaJpg)
+			{
+				currentFormat = ImageFormat.Jpeg;
+			}
 
-            PrepareThumbnailSize(g);
+			PrepareThumbnailSize(g);
 
-            // big image resolution
-            var imgOutputBig = new Bitmap(g, thumbSizeBig.Width, thumbSizeBig.Height);
-            imgOutputBig.SetResolution(g.HorizontalResolution, g.VerticalResolution);
+			// big image resolution
+			var imgOutputBig = new Bitmap(g, thumbSizeBig.Width, thumbSizeBig.Height);
+			imgOutputBig.SetResolution(g.HorizontalResolution, g.VerticalResolution);
 
 
-            if (_picSettings.CreaMiniature)
-            {
+			if (_picSettings.CreaMiniature)
+			{
 
-                CreaMiniature(g, imgOutputBig, currentFormat);
-            }
+				CreaMiniature(g, imgOutputBig, currentFormat);
+			}
 
-            
+			
 
 
 
 
-        }
+		}
 
 
-        private void Rotation(ref System.Drawing.Image g)
-        {
-            //FotoRuotaADestra = false;
-            //FotoRuotaASinistra = false;
-            _rotation = Rotazione.Normale;
+		private void Rotation(ref System.Drawing.Image g)
+		{
+			//FotoRuotaADestra = false;
+			//FotoRuotaASinistra = false;
+			_rotation = Rotazione.Normale;
 
-            if (_picSettings.UsaRotazioneAutomatica)
-            {
-                // ci sono dati exif
-                if (g.PropertyIdList.Length > 0)
-                {
-                    ExifReader DatiExif = new ExifReader((Bitmap)g);
+			if (_picSettings.UsaRotazioneAutomatica)
+			{
+				// ci sono dati exif
+				if (g.PropertyIdList.Length > 0)
+				{
+					ExifReader DatiExif = new ExifReader((Bitmap)g);
 
-                    switch (DatiExif.Orientation)
-                    {
-                        case ExifReader.Orientations.BottomLeft:
+					switch (DatiExif.Orientation)
+					{
+						case ExifReader.Orientations.BottomLeft:
 
-                            break;
-                        case ExifReader.Orientations.BottomRight:
+							break;
+						case ExifReader.Orientations.BottomRight:
 
-                            break;
-                        case ExifReader.Orientations.LeftTop:
+							break;
+						case ExifReader.Orientations.LeftTop:
 
-                            break;
-                        case ExifReader.Orientations.LftBottom:
-                            //FotoRuotaASinistra = true;
-                            _rotation = Rotazione.Sinistra;
-                            break;
-                        case ExifReader.Orientations.RightBottom:
+							break;
+						case ExifReader.Orientations.LftBottom:
+							//FotoRuotaASinistra = true;
+							_rotation = Rotazione.Sinistra;
+							break;
+						case ExifReader.Orientations.RightBottom:
 
-                            break;
-                        case ExifReader.Orientations.RightTop:
+							break;
+						case ExifReader.Orientations.RightTop:
 
-                            break;
-                        case ExifReader.Orientations.TopLeft:
+							break;
+						case ExifReader.Orientations.TopLeft:
 
-                            break;
-                        case ExifReader.Orientations.TopRight:
+							break;
+						case ExifReader.Orientations.TopRight:
 
-                            break;
-                    }
-                }
-            }
+							break;
+					}
+				}
+			}
 
-            if (_rotation == Rotazione.Sinistra)
-            {
-                g.RotateFlip(RotateFlipType.Rotate270FlipNone);
-            }else
-            if (_rotation == Rotazione.Destra)
-            {
-                g.RotateFlip(RotateFlipType.Rotate90FlipNone);
-            }
-            // todo: capire quando va ruotato a destra
-        }
+			if (_rotation == Rotazione.Sinistra)
+			{
+				g.RotateFlip(RotateFlipType.Rotate270FlipNone);
+			}else
+			if (_rotation == Rotazione.Destra)
+			{
+				g.RotateFlip(RotateFlipType.Rotate90FlipNone);
+			}
+			// todo: capire quando va ruotato a destra
+		}
 
-        /// <summary>
-        /// Aggiunge orario e tempo gara
-        /// </summary>
-        /// <param name="g"></param>
-        private void ImpostaTestoExtra(Image g)
-        {
-            if (_picSettings.UsaOrarioTestoApplicare ||
-                _picSettings.UsaTempoGaraTestoApplicare ||
-                _picSettings.UsaOrarioMiniatura ||
-                _picSettings.TestoMin ||
-                _picSettings.AggTempoGaraMin ||
-                _picSettings.AggNumTempMin)
-            {
-                if (g.PropertyIdList.Length > 0) //ci sono dati exif
-                {
-                    var datiExix = new ExifReader((Bitmap)g);
-                    dataFoto = datiExix.DateTimeOriginal;
-                    testoFirma = _picSettings.TestoFirmaStart;
-                    testoFirmaV = _picSettings.TestoFirmaStartV;
+		/// <summary>
+		/// Aggiunge orario e tempo gara
+		/// </summary>
+		/// <param name="g"></param>
+		private void ImpostaTestoExtra(Image g)
+		{
+			if (_picSettings.UsaOrarioTestoApplicare ||
+				_picSettings.UsaTempoGaraTestoApplicare ||
+				_picSettings.UsaOrarioMiniatura ||
+				_picSettings.TestoMin ||
+				_picSettings.AggTempoGaraMin ||
+				_picSettings.AggNumTempMin)
+			{
+				if (g.PropertyIdList.Length > 0) //ci sono dati exif
+				{
+					var datiExix = new ExifReader((Bitmap)g);
+					dataFoto = datiExix.DateTimeOriginal;
+					testoFirma = _picSettings.TestoFirmaStart;
+					testoFirmaV = _picSettings.TestoFirmaStartV;
 
-                    if (dataFoto.Year != 1)
-                    {
-                        testoFirmaPiccola = dataFoto.ToShortDateString();
-                        if (_picSettings.UsaOrarioTestoApplicare)
-                        {
-                            testoFirma = $"{testoFirma} {dataFoto.ToShortDateString()} {dataFoto.ToLongDateString()}";
-                            testoFirmaV = $"{testoFirmaV} {dataFoto.ToShortDateString()} {dataFoto.ToLongDateString()}";
-                            //testoFirma = string.Concat(testoFirma, " ", dataFoto.ToShortDateString(), " ", dataFoto.ToLongDateString());
-                            //testoFirmaV = string.Concat(testoFirmaV, " ", dataFoto.ToShortDateString(), " ", dataFoto.ToLongDateString());
+					if (dataFoto.Year != 1)
+					{
+						testoFirmaPiccola = dataFoto.ToShortDateString();
+						if (_picSettings.UsaOrarioTestoApplicare)
+						{
+							testoFirma = $"{testoFirma} {dataFoto.ToShortDateString()} {dataFoto.ToLongDateString()}";
+							testoFirmaV = $"{testoFirmaV} {dataFoto.ToShortDateString()} {dataFoto.ToLongDateString()}";
+							//testoFirma = string.Concat(testoFirma, " ", dataFoto.ToShortDateString(), " ", dataFoto.ToLongDateString());
+							//testoFirmaV = string.Concat(testoFirmaV, " ", dataFoto.ToShortDateString(), " ", dataFoto.ToLongDateString());
 
-                        }
-                        if (_picSettings.UsaTempoGaraTestoApplicare)
-                        {
-                            //TimeSpan orario = dataPartenzaI - dataFoto;
+						}
+						if (_picSettings.UsaTempoGaraTestoApplicare)
+						{
+							//TimeSpan orario = dataPartenzaI - dataFoto;
 
-                            string orarioString = (dataPartenzaI - dataFoto).ToString(@"hh\:mm\:ss");
+							string orarioString = (dataPartenzaI - dataFoto).ToString(@"hh\:mm\:ss");
 
-                            testoFirma = $"{testoFirma} {testoOrario} {orarioString}";
-                            testoFirmaV = $"{testoFirmaV} {testoOrario} {orarioString}";
+							testoFirma = $"{testoFirma} {testoOrario} {orarioString}";
+							testoFirmaV = $"{testoFirmaV} {testoOrario} {orarioString}";
 
-                            //testoFirma = string.Concat(testoFirma, " ", testoOrario, orario.ToString(@"hh\:mm\:ss"));
-                            //testoFirmaV = string.Concat(testoFirmaV, " ", testoOrario, orario.ToString(@"hh\:mm\:ss"));
-                        }
-                    }
-                }
-            }
-            else
-            {
-                testoFirma = _picSettings.TestoFirmaStart;
-                testoFirmaV = _picSettings.TestoFirmaStartV;
-            }
-        }
+							//testoFirma = string.Concat(testoFirma, " ", testoOrario, orario.ToString(@"hh\:mm\:ss"));
+							//testoFirmaV = string.Concat(testoFirmaV, " ", testoOrario, orario.ToString(@"hh\:mm\:ss"));
+						}
+					}
+				}
+			}
+			else
+			{
+				testoFirma = _picSettings.TestoFirmaStart;
+				testoFirmaV = _picSettings.TestoFirmaStartV;
+			}
+		}
 
-        /// <summary>
-        /// Preparazione delle variabili a valori di default e caricamento da impostazioni
-        /// </summary>
-        private void PreparaVariabili()
-        {
-            alphaScelta = (int)(255 * (100 - _picSettings.Trasparenza) / 100);
-            testoFirma = string.Empty;
-            testoFirmaV = string.Empty;
-            dataPartenzaI = _picSettings.DataPartenza;
-            testoOrario = _picSettings.TestoOrario;
-            if (testoOrario.Length > 0)
-            {
-                testoOrario += " ";
-            }
-            testoFirmaPiccola = string.Empty;
-            thumbSizeSmall = new Size();
-            thumbSizeBig = new Size();
-            nomeFileSmall = string.Empty;
-            nomeFileBig2 = string.Empty;
-            nomeFileBig = string.Empty;
-            _dimensioneStandard = _picSettings.DimStandard;
-            _dimensioneStandardMiniatura = _picSettings.DimStandardMiniatura;
+		/// <summary>
+		/// Preparazione delle variabili a valori di default e caricamento da impostazioni
+		/// </summary>
+		private void PreparaVariabili()
+		{
+			alphaScelta = (int)(255 * (100 - _picSettings.Trasparenza) / 100);
+			testoFirma = string.Empty;
+			testoFirmaV = string.Empty;
+			dataPartenzaI = _picSettings.DataPartenza;
+			testoOrario = _picSettings.TestoOrario;
+			if (testoOrario.Length > 0)
+			{
+				testoOrario += " ";
+			}
+			testoFirmaPiccola = string.Empty;
+			thumbSizeSmall = new Size();
+			thumbSizeBig = new Size();
+			nomeFileSmall = string.Empty;
+			nomeFileBig2 = string.Empty;
+			nomeFileBig = string.Empty;
+			_dimensioneStandard = _picSettings.DimStandard;
+			_dimensioneStandardMiniatura = _picSettings.DimStandardMiniatura;
 
-            nomeFileSmall = _picSettings.Suffisso + WorkFile.Name;
-            nomeFileBig = WorkFile.Name;
-        }
+			nomeFileSmall = _picSettings.Suffisso + WorkFile.Name;
+			nomeFileBig = WorkFile.Name;
+		}
 
-        private void PrepareThumbnailSize(Image g)
-        {
-            if (g.Width > g.Height)
-            {
-                thumbSizeSmall = NewthumbSize(g.Width, g.Height, CatalogVbLib.PicSettings.LarghezzaSmall, "Larghezza");
-                //Size sizeOrig = new Size(g.Width, g.Height);
-                //thumbSizeBig = sizeOrig;
-                
-                thumbSizeBig = new Size(g.Width, g.Height);
-            }
-            else
-            {
-                thumbSizeSmall = NewthumbSize(g.Width, g.Height, CatalogVbLib.PicSettings.AltezzaSmall, "Altezza");
-                
-                thumbSizeBig = new Size(g.Width, g.Height);
-            }
-        }
+		private void PrepareThumbnailSize(Image g)
+		{
+			if (g.Width > g.Height)
+			{
+				thumbSizeSmall = NewthumbSize(g.Width, g.Height, CatalogVbLib.PicSettings.LarghezzaSmall, "Larghezza");
+				//Size sizeOrig = new Size(g.Width, g.Height);
+				//thumbSizeBig = sizeOrig;
+				
+				thumbSizeBig = new Size(g.Width, g.Height);
+			}
+			else
+			{
+				thumbSizeSmall = NewthumbSize(g.Width, g.Height, CatalogVbLib.PicSettings.AltezzaSmall, "Altezza");
+				
+				thumbSizeBig = new Size(g.Width, g.Height);
+			}
+		}
 
-        private void CreaMiniature(Image g, Bitmap imgOutputBig, ImageFormat thisFormat)
-        {
+		private void CreaMiniature(Image g, Bitmap imgOutputBig, ImageFormat thisFormat)
+		{
 //            CatalogLib.PicSettings ps = new PicSettings();
 
-            if (_picSettings.TestoMin)
-            {
-                testoFirmaPiccola = nomeFileBig;
-            }
-            else if (_picSettings.AggNumTempMin)
-            {
-                testoFirmaPiccola = nomeFileBig + " ";
-            }
+			if (_picSettings.TestoMin)
+			{
+				testoFirmaPiccola = nomeFileBig;
+			}
+			else if (_picSettings.AggNumTempMin)
+			{
+				testoFirmaPiccola = nomeFileBig + " ";
+			}
 
-            Font crFont1;
-            Font crFont2;
-            SizeF crSize1 = new SizeF();
-            SizeF crSize2 = new SizeF();
+			Font crFont1;
+			Font crFont2;
+			SizeF crSize1 = new SizeF();
+			SizeF crSize2 = new SizeF();
 
-            if (_picSettings.CreaMiniature)
-            {
-                if (!_picSettings.AggiungiScritteMiniature)
-                {
-                    if (string.Equals(_picSettings.DirectorySorgente, _picSettings.DirectoryDestinazione, StringComparison.CurrentCultureIgnoreCase))
-                    {
-                        nomeFileSmall = nomeFileSmall.Substring(0, nomeFileSmall.Length - 4) + _picSettings.Codice +
-                                        nomeFileSmall.Substring(nomeFileSmall.Length - 4);
-                    }
+			if (_picSettings.CreaMiniature)
+			{
+				if (!_picSettings.AggiungiScritteMiniature)
+				{
+					if (string.Equals(_picSettings.DirectorySorgente, _picSettings.DirectoryDestinazione, StringComparison.CurrentCultureIgnoreCase))
+					{
+						nomeFileSmall = nomeFileSmall.Substring(0, nomeFileSmall.Length - 4) + _picSettings.Codice +
+										nomeFileSmall.Substring(nomeFileSmall.Length - 4);
+					}
 
-                    if (_picSettings.UsaOrarioMiniatura ||
-                        _picSettings.TestoMin ||
-                        _picSettings.AggTempoGaraMin ||
-                        _picSettings.AggNumTempMin)
-                    {
-                        if (!string.IsNullOrWhiteSpace(testoFirmaPiccola))
-                        {
-                            Bitmap imgOutputSmall = (Bitmap)imgOutputBig.Clone();
+					if (_picSettings.UsaOrarioMiniatura ||
+						_picSettings.TestoMin ||
+						_picSettings.AggTempoGaraMin ||
+						_picSettings.AggNumTempMin)
+					{
+						if (!string.IsNullOrWhiteSpace(testoFirmaPiccola))
+						{
+							Bitmap imgOutputSmall = (Bitmap)imgOutputBig.Clone();
 
-                            Graphics grPhoto1 = Graphics.FromImage(imgOutputSmall);
-                            grPhoto1.SmoothingMode = SmoothingMode.HighSpeed; //Todo: permettere di cambiare questo parametro
+							Graphics grPhoto1 = Graphics.FromImage(imgOutputSmall);
+							grPhoto1.SmoothingMode = SmoothingMode.HighSpeed; //Todo: permettere di cambiare questo parametro
 
-                            int larghezzaStandard1;
+							int larghezzaStandard1;
 
-                            _dimensioneStandardMiniatura = 50;
-                            bool grassetto = _picSettings.Grassetto;
-                            crFont1 = new Font(_picSettings.IlFont, _dimensioneStandardMiniatura, grassetto ? FontStyle.Bold : FontStyle.Regular);
-                            crFont2 = new Font(_picSettings.IlFont, _dimensioneStandard, grassetto ? FontStyle.Bold : FontStyle.Regular);
+							_dimensioneStandardMiniatura = 50;
+							bool grassetto = _picSettings.Grassetto;
+							crFont1 = new Font(_picSettings.IlFont, _dimensioneStandardMiniatura, grassetto ? FontStyle.Bold : FontStyle.Regular);
+							crFont2 = new Font(_picSettings.IlFont, _dimensioneStandard, grassetto ? FontStyle.Bold : FontStyle.Regular);
 
-                            crSize1 = grPhoto1.MeasureString(testoFirmaPiccola, crFont1);
-                            crSize2 = grPhoto1.MeasureString(testoFirma, crFont1);
+							crSize1 = grPhoto1.MeasureString(testoFirmaPiccola, crFont1);
+							crSize2 = grPhoto1.MeasureString(testoFirma, crFont1);
 
-                            larghezzaStandard1 = (int)crSize1.Width;
+							larghezzaStandard1 = (int)crSize1.Width;
 
-                            if (crSize1.Width > g.Width)
-                            {
-                                int conta = _dimensioneStandardMiniatura;
-                                do
-                                {
-                                    if (conta > 20)
-                                    {
-                                        conta -= 5;
-                                    }
-                                    else
-                                    {
-                                        conta -= 1;
-                                    }
+							if (crSize1.Width > g.Width)
+							{
+								int conta = _dimensioneStandardMiniatura;
+								do
+								{
+									if (conta > 20)
+									{
+										conta -= 5;
+									}
+									else
+									{
+										conta -= 1;
+									}
 
-                                    crFont1 = new Font(_picSettings.IlFont, conta, grassetto ? FontStyle.Bold : FontStyle.Regular);
-                                    crSize1 = grPhoto1.MeasureString(testoFirmaPiccola, crFont1);
+									crFont1 = new Font(_picSettings.IlFont, conta, grassetto ? FontStyle.Bold : FontStyle.Regular);
+									crSize1 = grPhoto1.MeasureString(testoFirmaPiccola, crFont1);
 
-                                    if (crSize1.Width < g.Width)
-                                    {
-                                        larghezzaStandard1 = (int)crSize1.Width;
-                                        break;
-                                    }
+									if (crSize1.Width < g.Width)
+									{
+										larghezzaStandard1 = (int)crSize1.Width;
+										break;
+									}
 
-                                } while (conta > 5);
-                                _dimensioneStandardMiniatura = conta;
+								} while (conta > 5);
+								_dimensioneStandardMiniatura = conta;
 
-                            }
+							}
 
-                            switch (_picSettings.Posizione.ToUpper())
-                            {
-                                case "ALTO":
-                                    yPosFromBottom1 = _picSettings.Margine;
-                                    yPosFromBottom4 = _picSettings.MargVert;
-                                    break;
+							switch (_picSettings.Posizione.ToUpper())
+							{
+								case "ALTO":
+									yPosFromBottom1 = _picSettings.Margine;
+									yPosFromBottom4 = _picSettings.MargVert;
+									break;
 
-                                case "BASSO":
-                                    yPosFromBottom1 =
-                                        (float)
-                                            (g.Height - crSize1.Height - (g.Height * CatalogVbLib.PicSettings.Margine / 100));
-                                    yPosFromBottom4 = (float)(g.Height - crSize1.Height - (g.Height * CatalogVbLib.PicSettings.MargVert / 100));
-                                    break;
-                            }
+								case "BASSO":
+									yPosFromBottom1 =
+										(float)
+											(g.Height - crSize1.Height - (g.Height * CatalogVbLib.PicSettings.Margine / 100));
+									yPosFromBottom4 = (float)(g.Height - crSize1.Height - (g.Height * CatalogVbLib.PicSettings.MargVert / 100));
+									break;
+							}
 
 
-                            float xCenterOfImg1 = Single.NaN;
+							float xCenterOfImg1 = Single.NaN;
 
-                            StringFormat strFormat1 = new StringFormat();
+							StringFormat strFormat1 = new StringFormat();
 
-                            switch (_picSettings.Allineamento.ToUpper())
-                            {
-                                case "SINISTRA":
-                                    xCenterOfImg1 = CatalogVbLib.PicSettings.Margine + (larghezzaStandard1 / 2);
-                                    if ((larghezzaStandard1 / 2) > (g.Width / 2) - CatalogVbLib.PicSettings.Margine)
-                                    {
-                                        xCenterOfImg1 = g.Width / 2;
-                                    }
-                                    break;
+							switch (_picSettings.Allineamento.ToUpper())
+							{
+								case "SINISTRA":
+									xCenterOfImg1 = CatalogVbLib.PicSettings.Margine + (larghezzaStandard1 / 2);
+									if ((larghezzaStandard1 / 2) > (g.Width / 2) - CatalogVbLib.PicSettings.Margine)
+									{
+										xCenterOfImg1 = g.Width / 2;
+									}
+									break;
 
-                                case "CENTRO":
-                                    xCenterOfImg1 = (g.Width / 2);
-                                    break;
+								case "CENTRO":
+									xCenterOfImg1 = (g.Width / 2);
+									break;
 
-                                case "DESTRA":
-                                    xCenterOfImg1 = (g.Width - CatalogVbLib.PicSettings.Margine - (larghezzaStandard1 / 2));
-                                    if ((larghezzaStandard1 / 2) > (g.Width / 2) - CatalogVbLib.PicSettings.Margine)
-                                    {
-                                        xCenterOfImg1 = g.Width / 2;
-                                    }
-                                    break;
+								case "DESTRA":
+									xCenterOfImg1 = (g.Width - CatalogVbLib.PicSettings.Margine - (larghezzaStandard1 / 2));
+									if ((larghezzaStandard1 / 2) > (g.Width / 2) - CatalogVbLib.PicSettings.Margine)
+									{
+										xCenterOfImg1 = g.Width / 2;
+									}
+									break;
 
-                            }
+							}
 
-                            strFormat1.Alignment = StringAlignment.Center;
+							strFormat1.Alignment = StringAlignment.Center;
 
-                            SolidBrush semiTransBrush21 = new SolidBrush(Color.FromArgb(alphaScelta, 0, 0, 0));
-                            SolidBrush semiTransBrush1 = new SolidBrush(Color.FromArgb(alphaScelta, CatalogVbLib.PicSettings.fontColoreRGB));
+							SolidBrush semiTransBrush21 = new SolidBrush(Color.FromArgb(alphaScelta, 0, 0, 0));
+							SolidBrush semiTransBrush1 = new SolidBrush(Color.FromArgb(alphaScelta, CatalogVbLib.PicSettings.fontColoreRGB));
 
-                            _dimensioneStandardMiniatura = CatalogVbLib.PicSettings.DimMin;
+							_dimensioneStandardMiniatura = CatalogVbLib.PicSettings.DimMin;
 
-                            if (_picSettings.Grassetto)
-                            {
-                                crFont1 = new Font(_picSettings.IlFont, _dimensioneStandardMiniatura, FontStyle.Bold);
-                            }
-                            else
-                            {
-                                crFont1 = new Font(_picSettings.IlFont, _dimensioneStandardMiniatura);
-                            }
+							if (_picSettings.Grassetto)
+							{
+								crFont1 = new Font(_picSettings.IlFont, _dimensioneStandardMiniatura, FontStyle.Bold);
+							}
+							else
+							{
+								crFont1 = new Font(_picSettings.IlFont, _dimensioneStandardMiniatura);
+							}
 
-                            if (_picSettings.TestoMin)
-                            {
-                                grPhoto1.DrawString(nomeFileBig, crFont1, semiTransBrush21, new PointF(xCenterOfImg1 + 1, yPosFromBottom1 + 1), strFormat1);
-                                grPhoto1.DrawString(nomeFileBig, crFont1, semiTransBrush1, new PointF(xCenterOfImg1, yPosFromBottom1), strFormat1);
-                            }
-                            else if (_picSettings.AggTempoGaraMin & _picSettings.UsaTempoGaraTestoApplicare)
-                            {
-                                //TimeSpan orario = (dataPartenzaI - dataFoto) * 10000000; //todo
-                                TimeSpan orario = dataPartenzaI - dataFoto; //todo controllare se torna la roba giusta
+							if (_picSettings.TestoMin)
+							{
+								grPhoto1.DrawString(nomeFileBig, crFont1, semiTransBrush21, new PointF(xCenterOfImg1 + 1, yPosFromBottom1 + 1), strFormat1);
+								grPhoto1.DrawString(nomeFileBig, crFont1, semiTransBrush1, new PointF(xCenterOfImg1, yPosFromBottom1), strFormat1);
+							}
+							else if (_picSettings.AggTempoGaraMin & _picSettings.UsaTempoGaraTestoApplicare)
+							{
+								//TimeSpan orario = (dataPartenzaI - dataFoto) * 10000000; //todo
+								TimeSpan orario = dataPartenzaI - dataFoto; //todo controllare se torna la roba giusta
 
-                                string tempStr = "";
+								string tempStr = "";
 
 
 
-                                tempStr += Environment.NewLine + testoOrario + orario.Hours.ToString("00") + ":" +
-                                           orario.Minutes.ToString("00") + ":" + orario.Seconds.ToString("00"); //todo: usare una stringa formato per sta boiata
+								tempStr += Environment.NewLine + testoOrario + orario.Hours.ToString("00") + ":" +
+										   orario.Minutes.ToString("00") + ":" + orario.Seconds.ToString("00"); //todo: usare una stringa formato per sta boiata
 
-                                grPhoto1.DrawString(tempStr, crFont1, semiTransBrush21, new PointF(xCenterOfImg1 + 1, yPosFromBottom1 + 1));
-                                grPhoto1.DrawString(tempStr, crFont1, semiTransBrush1, new PointF(xCenterOfImg1, yPosFromBottom1), strFormat1);
-                            }
-                            else if (_picSettings.AggNumTempMin) //todo semplificare la logica di sti eif
-                            {
-                                TimeSpan orario = dataPartenzaI - dataFoto; //todo controllare se torna la roba giusta
-                                string tempStr = "";
-                                tempStr += nomeFileBig + Environment.NewLine + testoOrario + orario.Hours.ToString("00") + ":" +
-                                           orario.Minutes.ToString("00") + ":" + orario.Seconds.ToString("00"); //todo: usare una stringa formato per sta boiata
+								grPhoto1.DrawString(tempStr, crFont1, semiTransBrush21, new PointF(xCenterOfImg1 + 1, yPosFromBottom1 + 1));
+								grPhoto1.DrawString(tempStr, crFont1, semiTransBrush1, new PointF(xCenterOfImg1, yPosFromBottom1), strFormat1);
+							}
+							else if (_picSettings.AggNumTempMin) //todo semplificare la logica di sti eif
+							{
+								TimeSpan orario = dataPartenzaI - dataFoto; //todo controllare se torna la roba giusta
+								string tempStr = "";
+								tempStr += nomeFileBig + Environment.NewLine + testoOrario + orario.Hours.ToString("00") + ":" +
+										   orario.Minutes.ToString("00") + ":" + orario.Seconds.ToString("00"); //todo: usare una stringa formato per sta boiata
 
-                                grPhoto1.DrawString(tempStr, crFont1, semiTransBrush21, new PointF(xCenterOfImg1 + 1, yPosFromBottom1 + 1));
-                                grPhoto1.DrawString(tempStr, crFont1, semiTransBrush1, new PointF(xCenterOfImg1, yPosFromBottom1), strFormat1);
-                            }
-                            else
-                            {
-                                grPhoto1.DrawString(testoFirmaPiccola, crFont1, semiTransBrush21, new PointF(xCenterOfImg1 + 1, yPosFromBottom1 + 1), strFormat1);
-                                grPhoto1.DrawString(testoFirmaPiccola, crFont1, semiTransBrush1, new PointF(xCenterOfImg1, yPosFromBottom1), strFormat1);
-                            }
+								grPhoto1.DrawString(tempStr, crFont1, semiTransBrush21, new PointF(xCenterOfImg1 + 1, yPosFromBottom1 + 1));
+								grPhoto1.DrawString(tempStr, crFont1, semiTransBrush1, new PointF(xCenterOfImg1, yPosFromBottom1), strFormat1);
+							}
+							else
+							{
+								grPhoto1.DrawString(testoFirmaPiccola, crFont1, semiTransBrush21, new PointF(xCenterOfImg1 + 1, yPosFromBottom1 + 1), strFormat1);
+								grPhoto1.DrawString(testoFirmaPiccola, crFont1, semiTransBrush1, new PointF(xCenterOfImg1, yPosFromBottom1), strFormat1);
+							}
 
 
-                            //Salva miniatura
-                            
-                            imgOutputSmall.Save(Path.Combine(DestDir.FullName, "Temp_" + nomeFileSmall), thisFormat);
-                            float width = 0;
-                            float height = 0;
-                            //float scale = Math.Min(width/imgOutputSmall.Width, height/imgOutputSmall.Height);
-                            using (var bmp = new Bitmap(thumbSizeSmall.Width, thumbSizeSmall.Height))
-                            {
-                                using (var graph = Graphics.FromImage(bmp))
-                                {
-                                    // uncomment for higher quality output
-                                    //graph.InterpolationMode = InterpolationMode.High;
-                                    //graph.CompositingQuality = CompositingQuality.HighQuality;
-                                    //graph.SmoothingMode = SmoothingMode.AntiAlias;
+							//Salva miniatura
+							
+							imgOutputSmall.Save(Path.Combine(DestDir.FullName, "Temp_" + nomeFileSmall), thisFormat);
+							float width = 0;
+							float height = 0;
+							//float scale = Math.Min(width/imgOutputSmall.Width, height/imgOutputSmall.Height);
+							using (var bmp = new Bitmap(thumbSizeSmall.Width, thumbSizeSmall.Height))
+							{
+								using (var graph = Graphics.FromImage(bmp))
+								{
+									// uncomment for higher quality output
+									//graph.InterpolationMode = InterpolationMode.High;
+									//graph.CompositingQuality = CompositingQuality.HighQuality;
+									//graph.SmoothingMode = SmoothingMode.AntiAlias;
 
-                                    graph.DrawImage(imgOutputSmall, new Rectangle(0, 0, (int)width, (int)height));
+									graph.DrawImage(imgOutputSmall, new Rectangle(0, 0, (int)width, (int)height));
 
-                                    bmp.Save(Path.Combine(DestDir.FullName, nomeFileSmall), thisFormat);
-                                }
-                            }
-                            //var bmp = new Bitmap(thumbSizeSmall.Width, thumbSizeSmall.Height);
-                            //var graph = Graphics.FromImage(bmp);
+									bmp.Save(Path.Combine(DestDir.FullName, nomeFileSmall), thisFormat);
+								}
+							}
+							//var bmp = new Bitmap(thumbSizeSmall.Width, thumbSizeSmall.Height);
+							//var graph = Graphics.FromImage(bmp);
 
 
 
@@ -551,68 +551,68 @@ namespace CatalogLib
 
 
 
-                            //imgOutputSmall.Save(Path.Combine(DestDir.FullName, nomeFileSmall), thisFormat);
+							//imgOutputSmall.Save(Path.Combine(DestDir.FullName, nomeFileSmall), thisFormat);
 
 
-                            //Image g2 = Image.FromFile(Path.Combine(DestDir.FullName, "Temp_" + nomeFileSmall));
-                            //Bitmap imgOutputSmall2 = new Bitmap(g2, thumbSizeSmall.Width, thumbSizeSmall.Height);
-                            //imgOutputSmall2.Save(Path.Combine(DestDir.FullName, nomeFileSmall), thisFormat);
+							//Image g2 = Image.FromFile(Path.Combine(DestDir.FullName, "Temp_" + nomeFileSmall));
+							//Bitmap imgOutputSmall2 = new Bitmap(g2, thumbSizeSmall.Width, thumbSizeSmall.Height);
+							//imgOutputSmall2.Save(Path.Combine(DestDir.FullName, nomeFileSmall), thisFormat);
 
 
 
-                        }
-                    }
+						}
+					}
 
 
-                }
-            }
+				}
+			}
 
 
 
-        }
+		}
 
 
 
-        /// <summary>
-        /// Calculate the Size of the New image
-        /// </summary>
-        /// <param name="currentwidth">Larghezza</param>
-        /// <param name="currentheight">Altezza</param>
-        /// <param name="MaxPixel"></param>
-        /// <param name="TipoSize"></param>
-        /// <returns></returns>
-        /// <remarks></remarks>
-        private Size NewthumbSize(int currentwidth, int currentheight, int MaxPixel, string TipoSize)
-        {
-            // e  
-            //*** Larghezza, Altezza, Auto
+		/// <summary>
+		/// Calculate the Size of the New image
+		/// </summary>
+		/// <param name="currentwidth">Larghezza</param>
+		/// <param name="currentheight">Altezza</param>
+		/// <param name="MaxPixel"></param>
+		/// <param name="TipoSize"></param>
+		/// <returns></returns>
+		/// <remarks></remarks>
+		private Size NewthumbSize(int currentwidth, int currentheight, int MaxPixel, string TipoSize)
+		{
+			// e  
+			//*** Larghezza, Altezza, Auto
 
-            double tempMultiplier = 0;
+			double tempMultiplier = 0;
 
-            if (TipoSize.ToUpper() == "Larghezza".ToUpper())
-            {
-                tempMultiplier = MaxPixel / currentwidth;
-            }
-            else if (TipoSize.ToUpper() == "Altezza".ToUpper())
-            {
-                tempMultiplier = MaxPixel / currentheight;
-            }
-            else
-            {
-                // portrait  
-                if (currentheight > currentwidth)
-                {
-                    tempMultiplier = MaxPixel / currentheight;
-                }
-                else
-                {
-                    tempMultiplier = MaxPixel / currentwidth;
-                }
-            }
+			if (TipoSize.ToUpper() == "Larghezza".ToUpper())
+			{
+				tempMultiplier = MaxPixel / currentwidth;
+			}
+			else if (TipoSize.ToUpper() == "Altezza".ToUpper())
+			{
+				tempMultiplier = MaxPixel / currentheight;
+			}
+			else
+			{
+				// portrait  
+				if (currentheight > currentwidth)
+				{
+					tempMultiplier = MaxPixel / currentheight;
+				}
+				else
+				{
+					tempMultiplier = MaxPixel / currentwidth;
+				}
+			}
 
-            Size NewSize = new Size(Convert.ToInt32(currentwidth * tempMultiplier), Convert.ToInt32(currentheight * tempMultiplier));
+			Size NewSize = new Size(Convert.ToInt32(currentwidth * tempMultiplier), Convert.ToInt32(currentheight * tempMultiplier));
 
-            return NewSize;
-        }
-    }
+			return NewSize;
+		}
+	}
 }
diff --git a/CatalogLib/PicSettings.cs b/CatalogLib/PicSettings.cs
index 05afee6..3e9f305 100644
--- a/CatalogLib/PicSettings.cs
+++ b/CatalogLib/PicSettings.cs
@@ -1,25 +1,36 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
+using Newtonsoft.Json;
+
 namespace CatalogLib
 {
     public class PicSettings
     {
-        //TODO: Singleton
+        private static PicSettings _instance = new PicSettings();
+
+        public static PicSettings Instance { get { return _instance; } }
 
         private Dictionary<string, object> _settingsDict = new Dictionary<string, object>();
 
-        
         public PicSettings()
         {
             SetDefaults();
         }
 
+        public string SerializeSettings()
+        {
+            return JsonConvert.SerializeObject(_settingsDict);
+
+
+        }
+
         public void Set(string key, object value)
         {
             if (_settingsDict.ContainsKey(key))
@@ -28,10 +39,27 @@ namespace CatalogLib
             }
             else
             {
-                _settingsDict.Add(key,value);
+                _settingsDict.Add(key, value);
             }
         }
 
+        public void SetString(string key, string value )
+        {
+            Set(key, value);
+        }
+
+        public void SetInt(string key, int value)
+        {
+            Set(key,value);
+        }
+
+        public void SetBool(string key, bool value)
+        {
+            Set(key, value);
+        }
+
+
+
         public bool Exists(string key)
         {
             return _settingsDict.ContainsKey(key);
@@ -39,52 +67,50 @@ namespace CatalogLib
 
         public int GetInt(string key)
         {
-            return _settingsDict.ContainsKey(key) ? (int) _settingsDict[key] : 0;
+            return _settingsDict.ContainsKey(key) ? (int)_settingsDict[key] : 0;
         }
 
         public string GetString(string key)
         {
-            return _settingsDict.ContainsKey(key) ? (string) _settingsDict[key] : string.Empty;
+            return _settingsDict.ContainsKey(key) ? (string)_settingsDict[key] : string.Empty;
         }
 
         public bool GetBool(string key)
         {
-            return _settingsDict.ContainsKey(key) && (bool) _settingsDict[key];
+            return _settingsDict.ContainsKey(key) && (bool)_settingsDict[key];
         }
 
-        public void SetBool(string key, bool value)
-        {
-            if (_settingsDict.ContainsKey(key))
-            {
-                _settingsDict[key] = value;
-            }
-            else
-            {
-                _settingsDict.Add(key, value);
-            }
-            
-        }
 
         public object GetObject(string key)
         {
             return _settingsDict.ContainsKey(key) ? _settingsDict[key] : null;
         }
 
-        
+
 
         public void SetDefaults()
         {
-            Set("dirSorgente",string.Empty);
-            Set("dirDestinazione",string.Empty);
-            Set("dirAggiornaSottodirectory", false);
-            Set("dirCreaSottoCartelle",false);
+            //Set("DirSorgente", string.Empty);
+            //Set("DirDestinazione", string.Empty);
+            //Set("DirAggiornaSottodirectory", false);
+            //Set("DirCreaSottoCartelle", false);
             //Set();
         }
 
-        public bool Grassetto 
+        public bool DirAggiornaSottoDirectory
+        {
+            get { return this.GetBool("DirAggiornaSottoDirectory"); }
+            set
+            {
+                this.SetBool("DirAggiornaSottoDirectory", value);
+                
+            }
+        }
+
+        public bool Grassetto
         {
             get { return GetBool("Grassetto"); }
-            set { SetBool("Grassetto", value);}
+            set { SetBool("Grassetto", value); }
         }
 
         public string IlFont //todo
@@ -123,33 +149,33 @@ namespace CatalogLib
             set { }
         }
 
-	    public bool AggiungiScritteMiniature
-	    {
-		    get { return false; }
-			set { }
-	    }
+        public bool AggiungiScritteMiniature
+        {
+            get { return false; }
+            set { }
+        }
 
-	    public string Suffisso
-	    {
-		    get { return string.Empty; }
-			set { }
-	    }
+        public string Suffisso
+        {
+            get { return string.Empty; }
+            set { }
+        }
 
-	    public string Codice
-	    {
-		    get { return null; }
-			set {}
-	    }
+        public string Codice
+        {
+            get { return null; }
+            set { }
+        }
 
-	    public int Trasparenza
-	    {
-		    get { return 0; }
-	    }
+        public int Trasparenza
+        {
+            get { return 0; }
+        }
 
-	    public string Posizione
-		{
-		    get { return string.Empty; }
-	    }
+        public string Posizione
+        {
+            get { return string.Empty; }
+        }
 
         public bool UsaRotazioneAutomatica { get; set; }
         public DateTime DataPartenza { get; set; }
@@ -161,10 +187,14 @@ namespace CatalogLib
         public string TestoFirmaStart { get; set; }
         public string TestoFirmaStartV { get; set; }
         public bool UsaForzaJpg { get; set; }
-        public string DirectorySorgente { get; set; }
-        public string DirectoryDestinazione { get; set; }
+        public string DirectorySorgente { get { return GetString("DirSorgente"); } set { SetString("DirSorgente", value); } }
+        public string DirectoryDestinazione { get { return GetString("DirDestinazione"); } set { SetString("DirDestinazione", value);} }
         public float Margine { get; set; }
         public float MargVert { get; set; }
         public string Allineamento { get; set; }
+        public bool GeneraleForzaJPG { get { return GetBool("GeneraleForzaJPG"); } set { SetBool("GeneraleForzaJPG", value);} }
+        public bool GeneraleRotazioneAutomatica { get { return GetBool("GeneraleRotazioneAutomatica"); } set { SetBool("GeneraleRotazioneAutomatica", value); } }
+        public bool GeneraleSovrascriviFile { get { return GetBool("GeneraleSovrascriviFile"); } set { SetBool("GeneraleSovrascriviFile", value); } }
+        
     }
 }
diff --git a/CatalogLib/packages.config b/CatalogLib/packages.config
new file mode 100644
index 0000000..90aba30
--- /dev/null
+++ b/CatalogLib/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
+</packages>
\ No newline at end of file
diff --git a/WPFCatalog/App.config b/WPFCatalog/App.config
index 8e15646..2d2a12d 100644
--- a/WPFCatalog/App.config
+++ b/WPFCatalog/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/WPFCatalog/App.xaml b/WPFCatalog/App.xaml
index 7e98dfe..b17e4a8 100644
--- a/WPFCatalog/App.xaml
+++ b/WPFCatalog/App.xaml
@@ -1,5 +1,5 @@
 <Application x:Class="WPFCatalog.App" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" StartupUri="MainWindow.xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" d1p1:Ignorable="d" xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006">
   <Application.Resources>
-    <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" xmlns:vm="clr-namespace:WPFCatalog.ViewModel" />
+    <!--<vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" xmlns:vm="clr-namespace:WPFCatalog.ViewModel" />-->
   </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/WPFCatalog/Icons/document-open-folder.png b/WPFCatalog/Icons/document-open-folder.png
new file mode 100644
index 0000000..98b8a94
Binary files /dev/null and b/WPFCatalog/Icons/document-open-folder.png differ
diff --git a/WPFCatalog/MainWindow.xaml b/WPFCatalog/MainWindow.xaml
index acaeff7..1af2a3a 100644
--- a/WPFCatalog/MainWindow.xaml
+++ b/WPFCatalog/MainWindow.xaml
@@ -5,12 +5,11 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:wpfCatalog="clr-namespace:WPFCatalog"
         mc:Ignorable="d" 
-        d:DataContext="{d:DesignInstance wpfCatalog:MainWindowViewModel}"
-        
-        
+
         Title="Image Catalog" Height="466" Width="772" 
-        
+        d:DataContext="{d:DesignInstance wpfCatalog:MainWindowViewModel}"
         >
+    <!--d:DataContext="{d:DesignInstance wpfCatalog:MainWindowViewModel}"-->
     <Window.Resources>
         <Style x:Key="CommonStyle" TargetType="FrameworkElement">
             <Setter Property="Margin" Value="4" />
@@ -66,26 +65,35 @@
                                     <ColumnDefinition />
                                     <ColumnDefinition Width="400"/>
                                     <ColumnDefinition Width="30"/>
+                                    <ColumnDefinition Width="30"/>
                                 </Grid.ColumnDefinitions>
 
 
                                 <Label Grid.Row="0" Grid.Column="0" Content="Sorgente"/>
                                 <TextBox Grid.Row="0" Grid.Column="1" x:Name="txtSorgente" Margin="0,5" Text="{Binding DirSorgente}" />
-                                <Button Grid.Row="0" Grid.Column="2" x:Name="btnOpenSorgente" Margin="5,5" Command="{Binding OpenSorgenteCommand}">
+                                <Button Grid.Row="0" Grid.Column="2" x:Name="btnSelectSorgente" Margin="5,5" Command="{Binding SelectSourceFolderCommand}">
                                     <Button.Content>
                                         <Image Source="Icons/document-open-6.png" />
                                     </Button.Content>
                                 </Button>
-
+                                <Button Grid.Row="0" Grid.Column="3" x:Name="btnOpenSorgente" Margin="5,5" Command="{Binding OpenSourceFolderCommand}">
+                                    <Button.Content>
+                                        <Image Source="Icons/document-open-folder.png" />
+                                    </Button.Content>
+                                </Button>
 
                                 <Label Grid.Row="1" Grid.Column="0" Content="Destinazione"/>
                                 <TextBox Grid.Row="1" Grid.Column="1" x:Name="txtDestinazione" Margin="0,5" Text="{Binding DirDestinazione}"/>
-                                <Button Grid.Row="1" Grid.Column="2" x:Name="btnOpenDestinazione" Margin="5,5" Command="{Binding OpenDestinazioneCommand}">
+                                <Button Grid.Row="1" Grid.Column="2" x:Name="btnSelectDestinazione" Margin="5,5" Command="{Binding SelectDestinationFolderCommand}">
                                     <Button.Content>
                                         <Image Source="Icons/document-open-6.png" />
                                     </Button.Content>
                                 </Button>
-
+                                <Button Grid.Row="1" Grid.Column="3" x:Name="btnOpenDestinazione" Margin="5.4,0,4.6,4.6" Command="{Binding OpenDestinationFolderCommand}" Height="19" VerticalAlignment="Bottom">
+                                    <Button.Content>
+                                        <Image Source="Icons/document-open-folder.png" />
+                                    </Button.Content>
+                                </Button>
                                 <CheckBox Grid.Row="2" Grid.Column="1" Content="Aggiorna le sottodirectory" x:Name="chkAggiornaSottodirectory" IsChecked="{Binding DirAggiornaSottoDirectory}"/>
 
                             </Grid>
@@ -93,7 +101,7 @@
                         </GroupBox>
                         <GroupBox Header="Generale" Margin="2">
                             <StackPanel Orientation="Vertical" >
-                                <CheckBox Content="Aggiorna JPG" x:Name="chkForzaJPG" IsChecked="{Binding GeneraleForzaJpg}" Margin="2"/>
+                                <CheckBox Content="Aggiorna JPG" x:Name="chkForzaJPG" IsChecked="{Binding GeneraleForzaJPG}" Margin="2"/>
                                 <CheckBox Content="Rotazione Automatica" x:Name="chkRotazioneAutomatica" IsChecked="{Binding GeneraleRotazioneAutomatica}" Margin="2"/>
                                 <CheckBox Content="Sovrascrivi File" x:Name="chkSovrascriviFile" IsChecked="{Binding GeneraleSovrascriviFile}"  Margin="2"/>
                             </StackPanel>
@@ -199,7 +207,8 @@
                                         <ColumnDefinition/>
                                     </Grid.ColumnDefinitions>
                                     <Label Grid.Row="0" Grid.Column="0" Content="Font"/>
-                                    <ComboBox Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Width="100" HorizontalAlignment="Right" SelectedItem="{Binding CarattereFont}" /> <!--todo-->
+                                    <ComboBox Grid.Row="0" Grid.Column="1" Grid.ColumnSpan="2" Width="100" HorizontalAlignment="Right" SelectedItem="{Binding CarattereFont}" />
+                                    <!--todo-->
 
                                     <CheckBox Grid.Row="0" Grid.Column="3" Content="Grassetto" VerticalAlignment="Center" IsChecked="{Binding CarattereGrassetto}" />
 
@@ -278,7 +287,8 @@
                                     <TextBox Grid.Row="0" Grid.Column="2" Text="{Binding TestoApplicareTrasparenza}" />
 
                                     <Label Grid.Row="1" Grid.Column="0" Content="Posizione" />
-                                    <ComboBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" /> <!--ToDo-->
+                                    <ComboBox Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" />
+                                    <!--ToDo-->
 
                                     <CheckBox Grid.Row="2" Grid.Column="1" Content="Orario" IsChecked="{Binding TestoApplicareOrario}"/>
                                     <CheckBox Grid.Row="2" Grid.Column="2" Content="Tempo Gara" IsChecked="{Binding TestoApplicareTempoGaraCheck}"/>
@@ -292,7 +302,8 @@
                                     <TextBox Grid.Row="1" Grid.Column="6" Grid.ColumnSpan="2" Text="{Binding TestoApplicareAllineamento}"/>
 
                                     <Label Grid.Row="2" Grid.Column="5" Content="Partenza" />
-                                    <ComboBox Grid.Row="2" Grid.Column="6" Grid.ColumnSpan="2" /> <!--todo-->
+                                    <ComboBox Grid.Row="2" Grid.Column="6" Grid.ColumnSpan="2" />
+                                    <!--todo-->
                                 </Grid>
                             </StackPanel>
                         </GroupBox>
@@ -392,10 +403,12 @@
                                 <TextBox Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" Text="{Binding LogoMargine}" />
 
                                 <Label Grid.Row="5" Grid.Column="0" Content="Posizione Orizzontale" />
-                                <ComboBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" /> <!--todo-->
+                                <ComboBox Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" />
+                                <!--todo-->
 
                                 <Label Grid.Row="6" Grid.Column="0" Content="Posizione Verticale" />
-                                <ComboBox Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2"  /> <!--todo-->
+                                <ComboBox Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2"  />
+                                <!--todo-->
 
                                 <Label Grid.Row="7" Grid.Column="0" Content="Colore Trasparente" />
                                 <Image Grid.Row="7" Grid.Column="1" Width="24" Height="24" HorizontalAlignment="Left" />
@@ -411,7 +424,14 @@
             </TabControl>
             <StackPanel DockPanel.Dock="Right" Orientation="Vertical">
                 <GroupBox DockPanel.Dock="Right" Header="Statistiche">
-                    <Button Content="STOP" Width="192" Command="{Binding StopCommand}"/>
+                    <StackPanel Orientation="Vertical">
+                        <StackPanel Orientation="Horizontal">
+                            <Button Content="Carica Impostazioni" Command="{Binding ImportSettingsCommand}"></Button>
+                            <Button Content="Salva Impostazioni" Command="{Binding ExportSettingsCommand}" ></Button>
+                        </StackPanel>
+                        <Button Content="Start"></Button>
+                        <Button Content="STOP" Command="{Binding StopCommand}"/>
+                    </StackPanel>
                 </GroupBox>
             </StackPanel>
 
diff --git a/WPFCatalog/MainWindowViewModel.cs b/WPFCatalog/MainWindowViewModel.cs
index 80b28bb..ca602f5 100644
--- a/WPFCatalog/MainWindowViewModel.cs
+++ b/WPFCatalog/MainWindowViewModel.cs
@@ -1,22 +1,103 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using CatalogLib;
+using GalaSoft.MvvmLight.Command;
+using MaddoLibrary.Helpers;
 
 namespace WPFCatalog
 {
     public class MainWindowViewModel : ViewModelBase
     {
-        public PicSettings PicSettings { get; set; }
+
+
+        public PicSettings PicSettings
+        {
+            get { return PicSettings.Instance; }
+        }
 
         public MainWindowViewModel()
         {
-            PicSettings = new PicSettings();
+            //PicSettings = new PicSettings();
+            RegisterCommands();
+        }
+
+        // todo: comandi e serializzazione
+
+        #region commands
+
+        public RelayCommand ExportSettingsCommand { get; private set; }
+        public RelayCommand SelectSourceFolderCommand { get; private set; }
+        public RelayCommand SelectDestinationFolderCommand { get; private set; }
+        public RelayCommand OpenSourceFolderCommand { get; private set; }
+        public RelayCommand OpenDestinationFolderCommand { get; private set; }
+
+        private void RegisterCommands()
+        {
+            ExportSettingsCommand = new RelayCommand(ExportSettings);
+            SelectSourceFolderCommand = new RelayCommand(SelectSourceFolder);
+            OpenSourceFolderCommand = new RelayCommand(OpenSourceFolder);
+
+            SelectDestinationFolderCommand = new RelayCommand(SelectDestinationFolder);
+            OpenDestinationFolderCommand = new RelayCommand(OpenDestinationFolder);
+
 
         }
 
+        private void OpenSourceFolder()
+        {
+            if (Directory.Exists(DirSorgente))
+            {
+                Process.Start("explorer.exe", DirSorgente);
+            }
+        }
+
+        private void OpenDestinationFolder()
+        {
+            if (Directory.Exists(DirDestinazione))
+            {
+                Process.Start("explorer.exe", DirDestinazione);
+            }
+        }
+
+
+
+        private void SelectSourceFolder()
+        {
+            var a = FileHelper.GetOpenFolderPath();
+
+            if (!string.IsNullOrWhiteSpace(a))
+            {
+                this.DirSorgente = a;
+                
+            }
+        }
+
+        private void SelectDestinationFolder()
+        {
+            var a = FileHelper.GetOpenFolderPath();
+
+            if (!string.IsNullOrWhiteSpace(a))
+            {
+                this.DirDestinazione = a;
+
+            }
+        }
+
+        private void ExportSettings()
+        {
+            string s = PicSettings.SerializeSettings();
+
+            DialogHelper.PopUpAlert(s, "data");
+            
+        }
+
+        #endregion
+
         #region Proprietà
 
         public PicSettings SettingsString
@@ -26,42 +107,46 @@ namespace WPFCatalog
 
         public string DirSorgente
         {
-            get { return PicSettings.GetString("dirSorgente"); }
-            set { PicSettings.Set("dirSorgente", value); }
+            get { return PicSettings.GetString("DirSorgente"); }
+            set { PicSettings.Set("DirSorgente", value); RaisePropertyChanged("DirSorgente"); }
         }
 
         public string DirDestinazione
         {
-            get { return PicSettings.GetString("dirDestinazione"); }
+            get { return PicSettings.DirectoryDestinazione; }
             set
             {
-                PicSettings.Set("dirDestinazione", value);
+                PicSettings.Set("DirDestinazione", value);
                 RaisePropertyChanged("DirDestinazione");
             }
         }
 
-        public bool DirSottoDirectory
+        public bool DirAggiornaSottoDirectory
         {
-            get { return PicSettings.GetBool("dirSottoDirectory"); }
+            get { return PicSettings.DirAggiornaSottoDirectory; }
             set
             {
-                PicSettings.Set("dirSottoDirectory", value);
-                RaisePropertyChanged("DirSottoDirectory");
+                PicSettings.DirAggiornaSottoDirectory = value;
+                RaisePropertyChanged("DirAggiornaSottoDirectory");
             }
         }
 
         public bool SubdirCreaSottoCartelle
         {
+            get { return true; }
+            set { }// temp
             //get { return PicSettings.GetBool("")}
         }
 
         public string DirDividiNumFile { get { return PicSettings.GetString("dirDividiNumFile"); } set { PicSettings.Set("dirDividiNumFile", value); } }
         public string DirDividiSuffisso { get { return PicSettings.GetString("dirDividiSuffisso"); } set { PicSettings.Set("dirDividiSuffisso", value); } }
-        public string DirDividiNumCifre { get { return PicSettings.GetString("dirDividiNumCifre"); } set { PicSettings.Set("dirDividiNumCifre", value); RaisePropertyChanged("DirDividiNumCifre");} }
+        public string DirDividiNumCifre { get { return PicSettings.GetString("dirDividiNumCifre"); } set { PicSettings.Set("dirDividiNumCifre", value); RaisePropertyChanged("DirDividiNumCifre"); } }
         public bool DirDividiDestinazione { get { return PicSettings.GetBool("dirDividiDestinazione"); } set { PicSettings.Set("dirDividiDestinazione", value); } }
         public bool DirDividiTipoNumerazioneProg { get { return PicSettings.GetString("DirDividiTipoNumerazione").ToUpper() == "PROGRESSIVA"; } set { if (value == true) PicSettings.Set("DirDividiTipoNumerazione", "PROGRESSIVA"); } }
         public bool DirDividiTipoNumerazioneFile { get { return PicSettings.GetString("DirDividiTipoNumerazione").ToUpper() == "FILES"; } set { if (value == false) PicSettings.Set("DirDividiTipoNumerazione", "FILES"); } }
-        public bool MiniatureCrea { get { return PicSettings.GetBool("miniatureCrea"); } set { PicSettings.Set("miniatureCrea",value); RaisePropertyChanged("MiniatureCrea");} }
+        public bool MiniatureCrea { get { return PicSettings.GetBool("miniatureCrea"); } set { PicSettings.Set("miniatureCrea", value); RaisePropertyChanged("MiniatureCrea"); } }
+
+        
 
         public string MiniatureSuffisso
         {
@@ -333,32 +418,32 @@ namespace WPFCatalog
             }
         }
 
-        public bool GeneraleForzaJpg
+        public bool GeneraleForzaJPG
         {
-            get { return PicSettings.GetBool("generaleForzaJpg"); }
+            get { return PicSettings.GeneraleForzaJPG; }
             set
             {
-                PicSettings.Set("generaleForzaJpg", value);
-                RaisePropertyChanged("GeneraleForzaJpg");
+                PicSettings.GeneraleForzaJPG = value;
+                RaisePropertyChanged("GeneraleForzaJPG");
             }
         }
 
         public bool GeneraleRotazioneAutomatica
         {
-            get { return PicSettings.GetBool("generaleRotazioneAutomatica"); }
+            get { return PicSettings.GeneraleRotazioneAutomatica; }
             set
             {
-                PicSettings.Set("generaleRotazioneAutomatica", value);
+                PicSettings.GeneraleRotazioneAutomatica = value;
                 RaisePropertyChanged("GeneraleRotazioneAutomatica");
             }
         }
 
         public bool GeneraleSovrascriviFile
         {
-            get { return PicSettings.GetBool("generaleSovrascriviFile"); }
+            get { return PicSettings.GeneraleSovrascriviFile; }
             set
             {
-                PicSettings.Set("generaleSovrascriviFile", value);
+                PicSettings.GeneraleSovrascriviFile = value;
                 RaisePropertyChanged("GeneraleSovrascriviFile");
             }
         }
diff --git a/WPFCatalog/Properties/Resources.Designer.cs b/WPFCatalog/Properties/Resources.Designer.cs
index aa15d26..8df4267 100644
--- a/WPFCatalog/Properties/Resources.Designer.cs
+++ b/WPFCatalog/Properties/Resources.Designer.cs
@@ -1,17 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18052
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WPFCatalog.Properties
-{
-
-
+namespace WPFCatalog.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -22,48 +22,40 @@ namespace WPFCatalog.Properties
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WPFCatalog.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/WPFCatalog/Properties/Settings.Designer.cs b/WPFCatalog/Properties/Settings.Designer.cs
index 7150058..4d8c32f 100644
--- a/WPFCatalog/Properties/Settings.Designer.cs
+++ b/WPFCatalog/Properties/Settings.Designer.cs
@@ -1,28 +1,24 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18052
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace WPFCatalog.Properties
-{
-
-
+namespace WPFCatalog.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
-        public static Settings Default
-        {
-            get
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/WPFCatalog/WPFCatalog.csproj b/WPFCatalog/WPFCatalog.csproj
index b987571..8d231cb 100644
--- a/WPFCatalog/WPFCatalog.csproj
+++ b/WPFCatalog/WPFCatalog.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WPFCatalog</RootNamespace>
     <AssemblyName>WPFCatalog</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -17,6 +17,7 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -166,6 +167,13 @@
       <Project>{d27accf2-80fc-4de8-aeb8-351ff076e6d5}</Project>
       <Name>CatalogLib</Name>
     </ProjectReference>
+    <ProjectReference Include="..\MaddoLibrary\MaddoLibrary.WPF.NET46\MaddoLibrary.WPF.NET46.csproj">
+      <Project>{73da19d7-196d-4b16-b610-93250978a607}</Project>
+      <Name>MaddoLibrary.WPF.NET46</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Icons\document-open-folder.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.