diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd7695919..04f09cf90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,88 @@
+# [1.33.0](https://github.com/bettyblocks/material-ui-component-set/compare/v1.32.6...v1.33.0) (2020-10-01)
+
+
+### Bug Fixes
+
+* acceptance merge conflict ([a813644](https://github.com/bettyblocks/material-ui-component-set/commit/a813644492e49c904c552bd7a4f1562840ecf889))
+* add custom model config from form ([059aa5c](https://github.com/bettyblocks/material-ui-component-set/commit/059aa5cd1d1aa7f027730a3fb26da90634930497))
+* add input variable option to input in form ([03d1c16](https://github.com/bettyblocks/material-ui-component-set/commit/03d1c1697a50dca49e931b435905222e3d71babc))
+* add property list values to checkbox group ([421d0c1](https://github.com/bettyblocks/material-ui-component-set/commit/421d0c1fadc4e4129bda42ff2a7b370cd57da41a))
+* add radix parameter ([96e4143](https://github.com/bettyblocks/material-ui-component-set/commit/96e4143bf266f068404953ed50f0e8b0ca9a055b))
+* add table title and table column content ([a7cdf1f](https://github.com/bettyblocks/material-ui-component-set/commit/a7cdf1f2cfb19568712f23c950b3581ff05a9700))
+* add table title and table column content ([#200](https://github.com/bettyblocks/material-ui-component-set/issues/200)) ([f9a8b33](https://github.com/bettyblocks/material-ui-component-set/commit/f9a8b3302287c5ea3016592feb39e6ad5b79afa0))
+* add use24hourClockTime key back to timePicker ([e90e2f7](https://github.com/bettyblocks/material-ui-component-set/commit/e90e2f7a6279eff3d79ccb679732f707364a6667))
+* allow only one data type ([1f12c51](https://github.com/bettyblocks/material-ui-component-set/commit/1f12c51ac4deb67a8d645065a12831450f66b196))
+* change category to navigation ([#205](https://github.com/bettyblocks/material-ui-component-set/issues/205)) ([182967d](https://github.com/bettyblocks/material-ui-component-set/commit/182967d002ee22008db2a3e81d8487c51a16c57c))
+* change tabs category ([#194](https://github.com/bettyblocks/material-ui-component-set/issues/194)) ([742d820](https://github.com/bettyblocks/material-ui-component-set/commit/742d82091ec61f33997d7bee9b18fee63cc1676b))
+* changed visible var setup ([0bb5d60](https://github.com/bettyblocks/material-ui-component-set/commit/0bb5d60ee35f98beb2a32fb1b59607f57aae7cf2))
+* checkbox group icon ([fae93c9](https://github.com/bettyblocks/material-ui-component-set/commit/fae93c9b8fad5411ca3e9a262108bd3b2a492017))
+* cleaner if/else ([a24f764](https://github.com/bettyblocks/material-ui-component-set/commit/a24f7649e9cdf5654dae3bd5ee1c318a60eb356f))
+* decimal label ([d62ab2e](https://github.com/bettyblocks/material-ui-component-set/commit/d62ab2e03dacb498a70a5efb2ff4b1eff399ba69))
+* fix merge conflicts ([5266ff0](https://github.com/bettyblocks/material-ui-component-set/commit/5266ff07c9e4f12e65ab1eb4b9319d24d3b7d8d6))
+* form textField prefab ([d4f3512](https://github.com/bettyblocks/material-ui-component-set/commit/d4f3512cccca9cab5b9853737c76576e5662e89f))
+* hide type option based on an existing option ([80a3b36](https://github.com/bettyblocks/material-ui-component-set/commit/80a3b36ef1130a2617ae4ee4028b41004022d329))
+* linter ([7cf925b](https://github.com/bettyblocks/material-ui-component-set/commit/7cf925b0820f5a4558e38af3b64c9b7dd6107449))
+* linting errors ([530a5e6](https://github.com/bettyblocks/material-ui-component-set/commit/530a5e66517e4abe6ea51f2d68f4f124ea5fdb03))
+* merge conflict remove old code ([c4ff316](https://github.com/bettyblocks/material-ui-component-set/commit/c4ff316fd18cc7963dc5752268f0390116be2a43))
+* nameAttribute value ([5efda9e](https://github.com/bettyblocks/material-ui-component-set/commit/5efda9e144d820be459d5638a11a2bca5ff9fe53))
+* optional pagination, optional sorting, use property content ([c166a38](https://github.com/bettyblocks/material-ui-component-set/commit/c166a385acb19c1d702088365a8a31fb29da6771))
+* priceInput value type ([ed9caba](https://github.com/bettyblocks/material-ui-component-set/commit/ed9caba32748ef14777d88673e18abcae921f0d8))
+* remove action component option from textfield ([0195f4e](https://github.com/bettyblocks/material-ui-component-set/commit/0195f4ee9fb269f40fa43baca89b92f590ec9ff5))
+* remove custom model config from form ([7635759](https://github.com/bettyblocks/material-ui-component-set/commit/7635759fed7ca6fbb9efc961931d660aebc28e4b))
+* remove duplicate actionInputId ([a8b4ab9](https://github.com/bettyblocks/material-ui-component-set/commit/a8b4ab90e9b96d9f17a05ecdb6ddcc15e448fb62))
+* remove duplicate input option ([6556a39](https://github.com/bettyblocks/material-ui-component-set/commit/6556a39960cf3971bad85a832d48af838b6c43c0))
+* remove extra characters in key ([a8e148d](https://github.com/bettyblocks/material-ui-component-set/commit/a8e148dd4a713776492ee3216d18c9ad7697481f))
+* remove key generateCustomModel ([0ddd75a](https://github.com/bettyblocks/material-ui-component-set/commit/0ddd75abc7d6b7eac99a499b26951107b2f1ed6a))
+* remove nameAttribute truthy check ([e1d7d18](https://github.com/bettyblocks/material-ui-component-set/commit/e1d7d184d9ec443b465cd515400557ba04379bbf))
+* remove redundant variable ([7aab8eb](https://github.com/bettyblocks/material-ui-component-set/commit/7aab8eb6618e2128575f2ed076eaf13fdea9edc6))
+* remove the model modal config in the form prefab ([e4d5765](https://github.com/bettyblocks/material-ui-component-set/commit/e4d5765930c2c77cb875d50a438be115e0c7ee66))
+* remove unused const ([5c84796](https://github.com/bettyblocks/material-ui-component-set/commit/5c84796c9e8fc70bd5cb20d8d6b8f0a83b6a7354))
+* rename checkbox to checkbox group and singlecheckbox to checkbox ([74199dc](https://github.com/bettyblocks/material-ui-component-set/commit/74199dc70b15d6648edefcdb4a2b1bec868d3951))
+* set icon color to important to override MUI ([4aa3b3e](https://github.com/bettyblocks/material-ui-component-set/commit/4aa3b3eb8d59fd8ada0f1358d10450c50631c8d6))
+* ternary lint errors ([1309a1e](https://github.com/bettyblocks/material-ui-component-set/commit/1309a1e473c6d39a06e3ec34d8524b152cbe44a3))
+* timePicker icon fix ([de3f0c3](https://github.com/bettyblocks/material-ui-component-set/commit/de3f0c38e8b716148ec2fadf32ed84da3c2915ce))
+* turn opacity on for auto repeated content ([6d427d7](https://github.com/bettyblocks/material-ui-component-set/commit/6d427d76c7b672c87fc04921db58e60cb7572c1f))
+* update cli version ([35c069e](https://github.com/bettyblocks/material-ui-component-set/commit/35c069e62fb615f377b0f03c772a5c9b0f29c98c))
+* update Data name to Model ([6b176c3](https://github.com/bettyblocks/material-ui-component-set/commit/6b176c3e9a48b84dc214ec6e97f852c243063418))
+* use property label in column heading ([#203](https://github.com/bettyblocks/material-ui-component-set/issues/203)) ([0d217bd](https://github.com/bettyblocks/material-ui-component-set/commit/0d217bdf9e01b5afa0d4f6e595fc035cb17548f6))
+* useHistory broke linter ([4fb4862](https://github.com/bettyblocks/material-ui-component-set/commit/4fb48624a753d8faf94cf8c8376801bb2cced7db))
+* variant flat instead of elevation level 0 ([66b012f](https://github.com/bettyblocks/material-ui-component-set/commit/66b012f0b5c2ef003cef3bfa5e7c8077b58a71db))
+* visible var change ([6913164](https://github.com/bettyblocks/material-ui-component-set/commit/691316476fd725bfb9df7e5ac78c729c2abe616e))
+
+
+### Features
+
+* add corresponding labels to date time pickers ([d181c5f](https://github.com/bettyblocks/material-ui-component-set/commit/d181c5ffa2d5dcb79fa1cdf7f7c1f2b13e39b14d))
+* add custom model and input variable to form ([06cd72b](https://github.com/bettyblocks/material-ui-component-set/commit/06cd72b1dfa017f734cb002d33a7902aa0e12232))
+* add custom model attribute option to textfield ([7596f02](https://github.com/bettyblocks/material-ui-component-set/commit/7596f021c419fba0dcef9ed1eb8dad2b6510fc6b))
+* add custom model attribute to 10 components ([791d8df](https://github.com/bettyblocks/material-ui-component-set/commit/791d8dfb3c08e6960f09615ce49a9da86aeae15a))
+* add custom model attribute to all form components ([bd098c8](https://github.com/bettyblocks/material-ui-component-set/commit/bd098c83736839f557bbfe623bbfb4b30793b382))
+* add custom model attribute to datetime pickers ([f2e3e1b](https://github.com/bettyblocks/material-ui-component-set/commit/f2e3e1bfd5ea0352f50328798ba26147a3993d22))
+* add custom model attribute with label ([c52e5b5](https://github.com/bettyblocks/material-ui-component-set/commit/c52e5b51d268df26a1a06c23ee7e8bbae98e694a))
+* add custom model handling to form components ([b575d0a](https://github.com/bettyblocks/material-ui-component-set/commit/b575d0a085ffff7613780a99fbe0dbe9b7c288d1))
+* add custom model variable to form data ([6b8578f](https://github.com/bettyblocks/material-ui-component-set/commit/6b8578f35ad2b53b9322a3ce78181f15e0f033f7))
+* add decimal prefab & add custom model attribute to number input ([5f36693](https://github.com/bettyblocks/material-ui-component-set/commit/5f36693de8cc6f9a7c3a4b61225c27bad507279b))
+* add form data option to form ([a3abf29](https://github.com/bettyblocks/material-ui-component-set/commit/a3abf293a8ead722496b90e169d2965220e1b058))
+* add gating for when results does not exist ([6bff533](https://github.com/bettyblocks/material-ui-component-set/commit/6bff533e1701efc30bfbf41988c74a0619930877))
+* add hidden input component ([#211](https://github.com/bettyblocks/material-ui-component-set/issues/211)) ([d59e5f2](https://github.com/bettyblocks/material-ui-component-set/commit/d59e5f267054b868e4b53d253bd2867200d9fb83)), closes [#208](https://github.com/bettyblocks/material-ui-component-set/issues/208)
+* add option for attribute generation inside form text component ([7fa3990](https://github.com/bettyblocks/material-ui-component-set/commit/7fa39900f5db43dc63e7cdf404364c705f5a88de))
+* add property optionType, make nameAttribute variable type ([f6027c2](https://github.com/bettyblocks/material-ui-component-set/commit/f6027c26219d8821b92aa4f3353cc299a501d092))
+* add single checkbox component ([1a5afc5](https://github.com/bettyblocks/material-ui-component-set/commit/1a5afc53f8473a65b8d8b0818619a90ecc84dec8))
+* add stepper component ([f64fea5](https://github.com/bettyblocks/material-ui-component-set/commit/f64fea50a2f63c57644021bb345d665f89bbba84))
+* add sticky header option ([0e23654](https://github.com/bettyblocks/material-ui-component-set/commit/0e23654e3c95f7aa3693eca5a41bc43867c8719a))
+* add support for multiple checkboxes ([0facaa8](https://github.com/bettyblocks/material-ui-component-set/commit/0facaa8dbceea4b47e847c9e231fc12b19b10ca6))
+* added a showhide function and fixed visibility ([ffad817](https://github.com/bettyblocks/material-ui-component-set/commit/ffad81715c01489048267f60b3a92f031af6e244))
+* disable button and show spinner if parent loading ([bd4a476](https://github.com/bettyblocks/material-ui-component-set/commit/bd4a4762aeda5b3c3c60b97e30b399e3fd8af4a7))
+* prevent decimals when using number type ([dee44da](https://github.com/bettyblocks/material-ui-component-set/commit/dee44da31bd7749462914956afd77a76f787facd))
+* replace GetOneProvider->ModelProvider ([33e28de](https://github.com/bettyblocks/material-ui-component-set/commit/33e28de4477e0195b3713c9445174be873137d22))
+* replace property & propertyLabelOverride with nameAttribute ([f7162a6](https://github.com/bettyblocks/material-ui-component-set/commit/f7162a65d5914dc1a094ed5a91f394339ef1b7c9))
+* show dialog by default ([ee852a3](https://github.com/bettyblocks/material-ui-component-set/commit/ee852a32cf17bbb7a8daefefcff37da79ad8f897))
+* split up dateTimePicker to 3 prefabs, with correct options ([98ec4e5](https://github.com/bettyblocks/material-ui-component-set/commit/98ec4e5825367aa7ba8843de602633116678913e))
+* split values on commas for default values ([#197](https://github.com/bettyblocks/material-ui-component-set/issues/197)) ([cfe3ec5](https://github.com/bettyblocks/material-ui-component-set/commit/cfe3ec50799d24b23273f619024adc7670920b27))
+* use material datatable instead of custom one ([9a6c0b9](https://github.com/bettyblocks/material-ui-component-set/commit/9a6c0b9b89e2a227b41a4b42a50f3cf3b889c2a9))
+* use state to control checkbox ([ed231e1](https://github.com/bettyblocks/material-ui-component-set/commit/ed231e1977cedad50b96ebd0073632c2feb76390))
+* use triggerEvent to tiggle submit button loading state ([f02db7f](https://github.com/bettyblocks/material-ui-component-set/commit/f02db7f5aea9c45e39fee66f28b6479a55524790))
+
 ## [1.32.6](https://github.com/bettyblocks/material-ui-component-set/compare/v1.32.5...v1.32.6) (2020-09-21)
 
 
diff --git a/package.json b/package.json
index 8b93166e5..2d9b146d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "component-set",
-  "version": "1.32.6",
+  "version": "1.33.0",
   "main": "dist/templates.json",
   "license": "UNLICENSED",
   "private": false,