diff --git a/NTwain/CapWrapper.cs b/NTwain/CapWrapper.cs
index d5ab39e..111723d 100644
--- a/NTwain/CapWrapper.cs
+++ b/NTwain/CapWrapper.cs
@@ -397,6 +397,24 @@ namespace NTwain
             return rc;
         }
 
+        /// <summary>
+        /// A version of Set that uses an enumeration.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns></returns>
+        public ReturnCode Set(TWEnumeration value)
+        {
+            ReturnCode rc = ReturnCode.Failure;
+            if (CanSet)
+            {
+                using (var cap = new TWCapability(Capability, value))
+                {
+                    rc = _source.DGControl.Capability.Set(cap);
+                }
+            }
+            return rc;
+        }
+
         /// <summary>
         /// Sets the constraint value of this capability.
         /// </summary>
diff --git a/NTwain/DataSource.Caps.cs b/NTwain/DataSource.Caps.cs
index 76890c0..c942d8c 100644
--- a/NTwain/DataSource.Caps.cs
+++ b/NTwain/DataSource.Caps.cs
@@ -166,8 +166,6 @@ namespace NTwain
 
         #endregion
 
-        #region high-level caps stuff
-
         #region audio caps
 
         private CapWrapper<XferMech> _audXferMech;
@@ -347,7 +345,26 @@ namespace NTwain
             }
         }
 
-        // TODO: add ICapCustHalftone
+        private CapWrapper<byte> _custHalftone;
+
+        /// <summary>
+        /// Gets the property to work with image square-cell halftone for the current source.
+        /// </summary>
+        /// <value>
+        /// The image square-cell halftone.
+        /// </value>
+        public ICapWrapper<byte> ICapCustHalftone
+        {
+            get
+            {
+                return _custHalftone ?? (_custHalftone = new CapWrapper<byte>(this, CapabilityId.ICapCustHalftone, ValueExtensions.ConvertToEnum<byte>,
+                        value => new TWOneValue
+                        {
+                            Item = value,
+                            ItemType = ItemType.UInt8
+                        }));
+            }
+        }
 
         private CapWrapper<TWFix32> _exposureTime;
 
@@ -1697,6 +1714,227 @@ namespace NTwain
             }
         }
 
+        private CapWrapper<BoolType> _cropUseFrame;
+
+        /// <summary>
+        /// Gets the property to work with image auto crop flag for the current source.
+        /// </summary>
+        /// <value>
+        /// The image auto crop flag.
+        /// </value>
+        public IReadOnlyCapWrapper<BoolType> ICapAutomaticCropUsesFrame
+        {
+            get
+            {
+                return _cropUseFrame ?? (_cropUseFrame = new CapWrapper<BoolType>(this, CapabilityId.ICapAutomaticCropUsesFrame, ValueExtensions.ConvertToEnum<BoolType>));
+            }
+        }
+
+        private CapWrapper<BoolType> _lengthDetect;
+
+        /// <summary>
+        /// Gets the property to work with image auto length detection flag for the current source.
+        /// </summary>
+        /// <value>
+        /// The image auto length detection flag.
+        /// </value>
+        public ICapWrapper<BoolType> ICapAutomaticLengthDetection
+        {
+            get
+            {
+                return _lengthDetect ?? (_lengthDetect = new CapWrapper<BoolType>(this, CapabilityId.ICapAutomaticLengthDetection, ValueExtensions.ConvertToEnum<BoolType>,
+                    value => new TWOneValue
+                    {
+                        Item = (uint)value,
+                        ItemType = ItemType.Bool
+                    }));
+            }
+        }
+
+        private CapWrapper<BoolType> _autoColor;
+
+        /// <summary>
+        /// Gets the property to work with image auto color detection flag for the current source.
+        /// </summary>
+        /// <value>
+        /// The image auto color detection flag.
+        /// </value>
+        public ICapWrapper<BoolType> ICapAutomaticColorEnabled
+        {
+            get
+            {
+                return _autoColor ?? (_autoColor = new CapWrapper<BoolType>(this, CapabilityId.ICapAutomaticColorEnabled, ValueExtensions.ConvertToEnum<BoolType>,
+                    value => new TWOneValue
+                    {
+                        Item = (uint)value,
+                        ItemType = ItemType.Bool
+                    }));
+            }
+        }
+
+        private CapWrapper<PixelType> _autoColorNonPixel;
+
+        /// <summary>
+        /// Gets the property to work with image auto non-color pixel type for the current source.
+        /// </summary>
+        /// <value>
+        /// The image auto non-color pixel type.
+        /// </value>
+        public ICapWrapper<PixelType> ICapAutomaticColorNonColorPixelType
+        {
+            get
+            {
+                return _autoColorNonPixel ?? (_autoColorNonPixel = new CapWrapper<PixelType>(this, CapabilityId.ICapAutomaticColorNonColorPixelType, ValueExtensions.ConvertToEnum<PixelType>,
+                    value => new TWOneValue
+                    {
+                        Item = (uint)value,
+                        ItemType = ItemType.UInt16
+                    }));
+            }
+        }
+
+        private CapWrapper<BoolType> _colorMgmt;
+
+        /// <summary>
+        /// Gets the property to work with image color management flag for the current source.
+        /// </summary>
+        /// <value>
+        /// The image color management flag.
+        /// </value>
+        public ICapWrapper<BoolType> ICapColorManagementEnabled
+        {
+            get
+            {
+                return _colorMgmt ?? (_colorMgmt = new CapWrapper<BoolType>(this, CapabilityId.ICapColorManagementEnabled, ValueExtensions.ConvertToEnum<BoolType>,
+                    value => new TWOneValue
+                    {
+                        Item = (uint)value,
+                        ItemType = ItemType.Bool
+                    }));
+            }
+        }
+
+        private CapWrapper<ImageMerge> _imgMerge;
+
+        /// <summary>
+        /// Gets the property to work with image merge option for the current source.
+        /// </summary>
+        /// <value>
+        /// The image merge option.
+        /// </value>
+        public ICapWrapper<ImageMerge> ICapImageMerge
+        {
+            get
+            {
+                return _imgMerge ?? (_imgMerge = new CapWrapper<ImageMerge>(this, CapabilityId.ICapImageMerge, ValueExtensions.ConvertToEnum<ImageMerge>,
+                    value => new TWOneValue
+                    {
+                        Item = (uint)value,
+                        ItemType = ItemType.UInt16
+                    }));
+            }
+        }
+
+        private CapWrapper<TWFix32> _mergeHeight;
+
+        /// <summary>
+        /// Gets the property to work with image merge height threshold for the current source.
+        /// </summary>
+        /// <value>
+        /// The image merge height threshold.
+        /// </value>
+        public ICapWrapper<TWFix32> ICapImageMergeHeightThreshold
+        {
+            get
+            {
+                return _mergeHeight ?? (_mergeHeight = new CapWrapper<TWFix32>(this, CapabilityId.ICapImageMergeHeightThreshold, ValueExtensions.ConvertToFix32,
+                        value => new TWOneValue
+                        {
+                            Item = (uint)value,// ((uint)dpi) << 16;
+                            ItemType = ItemType.Fix32
+                        }));
+            }
+        }
+
+        private CapWrapper<ExtendedImageInfo> _supportedExtInfo;
+
+        /// <summary>
+        /// Gets the property to get supported ext image info for the current source.
+        /// </summary>
+        /// <value>
+        /// The supported ext image info.
+        /// </value>
+        public IReadOnlyCapWrapper<ExtendedImageInfo> ICapSupportedExtImageInfo
+        {
+            get
+            {
+                return _supportedExtInfo ?? (_supportedExtInfo = new CapWrapper<ExtendedImageInfo>(this, CapabilityId.ICapSupportedExtImageInfo, ValueExtensions.ConvertToEnum<ExtendedImageInfo>));
+            }
+        }
+
+        private CapWrapper<FilmType> _filmType;
+
+        /// <summary>
+        /// Gets the property to work with image film type for the current source.
+        /// </summary>
+        /// <value>
+        /// The image film type.
+        /// </value>
+        public ICapWrapper<FilmType> ICapFilmType
+        {
+            get
+            {
+                return _filmType ?? (_filmType = new CapWrapper<FilmType>(this, CapabilityId.ICapFilmType, ValueExtensions.ConvertToEnum<FilmType>,
+                    value => new TWOneValue
+                    {
+                        Item = (uint)value,
+                        ItemType = ItemType.UInt16
+                    }));
+            }
+        }
+
+        private CapWrapper<Mirror> _mirror;
+
+        /// <summary>
+        /// Gets the property to work with image mirror option for the current source.
+        /// </summary>
+        /// <value>
+        /// The image mirror option.
+        /// </value>
+        public ICapWrapper<Mirror> ICapMirror
+        {
+            get
+            {
+                return _mirror ?? (_mirror = new CapWrapper<Mirror>(this, CapabilityId.ICapMirror, ValueExtensions.ConvertToEnum<Mirror>,
+                    value => new TWOneValue
+                    {
+                        Item = (uint)value,
+                        ItemType = ItemType.UInt16
+                    }));
+            }
+        }
+
+        private CapWrapper<JpegSubsampling> _jpegSubSampling;
+
+        /// <summary>
+        /// Gets the property to work with image jpeg sub sampling for the current source.
+        /// </summary>
+        /// <value>
+        /// The image jpeg sub sampling.
+        /// </value>
+        public ICapWrapper<JpegSubsampling> ICapJpegSubsampling
+        {
+            get
+            {
+                return _jpegSubSampling ?? (_jpegSubSampling = new CapWrapper<JpegSubsampling>(this, CapabilityId.ICapJpegSubsampling, ValueExtensions.ConvertToEnum<JpegSubsampling>,
+                    value => new TWOneValue
+                    {
+                        Item = (uint)value,
+                        ItemType = ItemType.UInt16
+                    }));
+            }
+        }
+
         #endregion
 
         #region general caps
@@ -2085,7 +2323,5 @@ namespace NTwain
 
         #endregion
 
-        #endregion
-
     }
 }
diff --git a/NTwain/ICapWrapper.cs b/NTwain/ICapWrapper.cs
index a4906f8..fc712fd 100644
--- a/NTwain/ICapWrapper.cs
+++ b/NTwain/ICapWrapper.cs
@@ -169,6 +169,13 @@ namespace NTwain
         /// <returns></returns>
         ReturnCode Set(TWArray value);
 
+        /// <summary>
+        /// A version of Set that uses an enumeration.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns></returns>
+        ReturnCode Set(TWEnumeration value);
+
         /// <summary>
         /// Sets the constraint value of this capability.
         /// </summary>
diff --git a/Tests/Tester.WPF/MainWindow.xaml.cs b/Tests/Tester.WPF/MainWindow.xaml.cs
index 48298cf..3db6fc6 100644
--- a/Tests/Tester.WPF/MainWindow.xaml.cs
+++ b/Tests/Tester.WPF/MainWindow.xaml.cs
@@ -366,19 +366,19 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapAutomaticBorderDetection.Get();
                         break;
                     case CapabilityId.ICapAutomaticColorEnabled:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapAutomaticColorEnabled.Get();
                         break;
                     case CapabilityId.ICapAutomaticColorNonColorPixelType:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<PixelType>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapAutomaticColorNonColorPixelType.Get();
                         break;
                     case CapabilityId.ICapAutomaticCropUsesFrame:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapAutomaticCropUsesFrame.Get();
                         break;
                     case CapabilityId.ICapAutomaticDeskew:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapAutomaticDeskew.Get();
                         break;
                     case CapabilityId.ICapAutomaticLengthDetection:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapAutomaticLengthDetection.Get();
                         break;
                     case CapabilityId.ICapAutomaticRotate:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapAutomaticRotate.Get();
@@ -423,7 +423,7 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapCCITTKFactor.Get();
                         break;
                     case CapabilityId.ICapColorManagementEnabled:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapColorManagementEnabled.Get();
                         break;
                     case CapabilityId.ICapCompression:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapCompression.Get();
@@ -432,7 +432,7 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapContrast.Get();
                         break;
                     case CapabilityId.ICapCustHalftone:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapCustHalftone.Get();
                         break;
                     case CapabilityId.ICapExposureTime:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapExposureTime.Get();
@@ -441,10 +441,10 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapExtImageInfo.Get();
                         break;
                     case CapabilityId.ICapFeederType:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<FeederType>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapFeederType.Get();
                         break;
                     case CapabilityId.ICapFilmType:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<FilmType>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapFilmType.Get();
                         break;
                     case CapabilityId.ICapFilter:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapFilter.Get();
@@ -480,13 +480,13 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapImageFileFormat.Get();
                         break;
                     case CapabilityId.ICapImageFilter:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapImageFilter.Get();
                         break;
                     case CapabilityId.ICapImageMerge:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<ImageMerge>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapImageMerge.Get();
                         break;
                     case CapabilityId.ICapImageMergeHeightThreshold:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap);
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapImageMergeHeightThreshold.Get();
                         break;
                     case CapabilityId.ICapJpegPixelType:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapJpegPixelType.Get();
@@ -495,7 +495,7 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapJpegQuality.Get();
                         break;
                     case CapabilityId.ICapJpegSubsampling:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<JpegSubsampling>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapJpegSubsampling.Get();
                         break;
                     case CapabilityId.ICapLampState:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapLampState.Get();
@@ -516,7 +516,7 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapMinimumWidth.Get();
                         break;
                     case CapabilityId.ICapMirror:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<Mirror>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapMirror.Get();
                         break;
                     case CapabilityId.ICapNoiseFilter:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapNoiseFilter.Get();
@@ -574,7 +574,7 @@ namespace Tester.WPF
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapSupportedBarcodeTypes.Get();
                         break;
                     case CapabilityId.ICapSupportedExtImageInfo:
-                        CapDetailList.ItemsSource = _twainVM.CurrentSource.CapGet(cap).CastToEnum<ExtendedImageInfo>();
+                        CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapSupportedExtImageInfo.Get();
                         break;
                     case CapabilityId.ICapSupportedPatchCodeTypes:
                         CapDetailList.ItemsSource = _twainVM.CurrentSource.ICapSupportedPatchCodeTypes.Get();