diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/index.js
index 987c73b3dd..46aac119df 100644
--- a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/index.js
+++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/index.js
@@ -32,7 +32,7 @@ function ApplicationsTemplatesCreateForm () {
   })
 
   const onSubmit = formData => {
-    const application = parseApplicationToForm(formData)
+    const application = parseFormToApplication(formData)
 
     if (id) {
       updateApplicationTemplate({ id, data: application }).then(
@@ -50,7 +50,7 @@ function ApplicationsTemplatesCreateForm () {
   }, [id])
 
   useEffect(() => {
-    const formData = data ? parseFormToApplication(data) : {}
+    const formData = data ? parseApplicationToForm(data) : {}
     methods.reset(resolvers().cast(formData), { errors: false })
   }, [data])
 
diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Deploy/index.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Deploy/index.js
index 65638f74db..2d9d2b139c 100644
--- a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Deploy/index.js
+++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Deploy/index.js
@@ -7,7 +7,7 @@ import { useFetchAll, useOpennebula, useApplication } from 'client/hooks'
 import { DialogForm } from 'client/components/Dialogs'
 import FormStepper from 'client/components/FormStepper'
 
-import { parseApplicationToForm, parseFormToApplication } from 'client/utils'
+import { parseApplicationToForm, parseFormToDeployApplication } from 'client/utils'
 import Steps from 'client/containers/ApplicationsTemplates/Form/Deploy/Steps'
 
 const useStyles = makeStyles(theme => ({
@@ -54,7 +54,7 @@ const DeployForm = ({ applicationTemplate, handleCancel }) => {
     const {
       instances,
       ...application
-    } = parseFormToApplication(values, applicationParsed)
+    } = parseFormToDeployApplication(values, applicationParsed)
 
     return instantiateApplicationTemplate({
       id: applicationTemplate.ID,
diff --git a/src/fireedge/src/client/theme/flow.js b/src/fireedge/src/client/theme/flow.js
index a22738892c..8581fb396d 100644
--- a/src/fireedge/src/client/theme/flow.js
+++ b/src/fireedge/src/client/theme/flow.js
@@ -1,20 +1,21 @@
 export default {
   palette: {
-    common: { black: '#000', white: '#fff' },
+    type: 'dark',
+    common: { black: '#000', white: '#ffffff' },
     background: {
-      paper: '#fff',
-      default: '#fafafa'
+      paper: '#2a2d3d',
+      default: '#222431'
     },
     primary: {
-      light: 'rgba(191, 230, 242, 1)',
-      main: 'rgba(64, 179, 217, 1)',
-      dark: 'rgba(0, 152, 195, 1)',
+      light: '#2a2d3d',
+      main: '#222431',
+      dark: '#191924',
       contrastText: '#fff'
     },
     secondary: {
-      light: 'rgba(199, 201, 200, 1)',
-      main: 'rgba(87, 92, 91, 1)',
-      dark: 'rgba(53, 55, 53, 1)',
+      light: 'rgba(191, 230, 242, 1)',
+      main: 'rgba(64, 179, 217, 1)',
+      dark: 'rgba(0, 152, 195, 1)',
       contrastText: '#fff'
     },
     error: {
@@ -22,12 +23,6 @@ export default {
       main: '#f44336',
       dark: '#d32f2f',
       contrastText: '#fff'
-    },
-    text: {
-      primary: 'rgba(0, 0, 0, 0.87)',
-      secondary: 'rgba(0, 0, 0, 0.54)',
-      disabled: 'rgba(0, 0, 0, 0.38)',
-      hint: 'rgba(0, 0, 0, 0.38)'
     }
   }
 }