diff --git a/src/Mod/Fem/femsolver/elmer/equations/elasticity.py b/src/Mod/Fem/femsolver/elmer/equations/elasticity.py
index 9a4057cc6b..3ba6db2b99 100644
--- a/src/Mod/Fem/femsolver/elmer/equations/elasticity.py
+++ b/src/Mod/Fem/femsolver/elmer/equations/elasticity.py
@@ -45,23 +45,41 @@ class Proxy(linear.Proxy, equationbase.ElasticityProxy):
     def __init__(self, obj):
         super(Proxy, self).__init__(obj)
         obj.addProperty(
-            "App::PropertyBool", "DoFrequencyAnalysis",
-            "Elasticity", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "DoFrequencyAnalysis",
+            "Elasticity",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyInteger", "EigenmodesCount",
-            "Elasticity", "Select type of solver for linear system")
+            "App::PropertyInteger",
+            "EigenmodesCount",
+            "Elasticity",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyBool", "CalculateStrains",
-            "Elasticity", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "CalculateStrains",
+            "Elasticity",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyBool", "CalculateStresses",
-            "Elasticity", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "CalculateStresses",
+            "Elasticity",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyBool", "CalculatePrincipal",
-            "Elasticity", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "CalculatePrincipal",
+            "Elasticity",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyBool", "CalculatePangle",
-            "Elasticity", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "CalculatePangle",
+            "Elasticity",
+            "Select type of solver for linear system"
+        )
         obj.EigenmodesCount = 5
         obj.Priority = 10
 
diff --git a/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py b/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py
index ee187501ec..a7dc8f1844 100644
--- a/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py
+++ b/src/Mod/Fem/femsolver/elmer/equations/electrostatic.py
@@ -45,24 +45,42 @@ class Proxy(linear.Proxy, equationbase.ElectrostaticProxy):
     def __init__(self, obj):
         super(Proxy, self).__init__(obj)
         obj.addProperty(
-            "App::PropertyBool", "CalculateElectricField",
-            "Electrostatic", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "CalculateElectricField",
+            "Electrostatic",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyBool", "CalculateElectricFlux",
-            "Electrostatic", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "CalculateElectricFlux",
+            "Electrostatic",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyBool", "CalculateElectricEnergy",
-            "Electrostatic", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "CalculateElectricEnergy",
+            "Electrostatic",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyBool", "CalculateSurfaceCharge",
-            "Electrostatic", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "CalculateSurfaceCharge",
+            "Electrostatic",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyBool", "CalculateCapacitanceMatrix",
-            "Electrostatic", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "CalculateCapacitanceMatrix",
+            "Electrostatic",
+            "Select type of solver for linear system"
+        )
         """
-        #obj.addProperty(
-            #"App::PropertyInteger", "CapacitanceBodies",
-            #"Electrostatic", "Select type of solver for linear system")
+        obj.addProperty(
+            "App::PropertyInteger",
+            "CapacitanceBodies",
+            "Electrostatic",
+            "Select type of solver for linear system"
+        )
         """
 
         obj.Priority = 10
diff --git a/src/Mod/Fem/femsolver/elmer/equations/equation.py b/src/Mod/Fem/femsolver/elmer/equations/equation.py
index d69a15a09f..2886aaf1a4 100644
--- a/src/Mod/Fem/femsolver/elmer/equations/equation.py
+++ b/src/Mod/Fem/femsolver/elmer/equations/equation.py
@@ -42,8 +42,11 @@ class Proxy(equationbase.BaseProxy):
     def __init__(self, obj):
         super(Proxy, self).__init__(obj)
         obj.addProperty(
-            "App::PropertyInteger", "Priority",
-            "Base", "Select type of solver for linear system")
+            "App::PropertyInteger",
+            "Priority",
+            "Base",
+            "Select type of solver for linear system"
+        )
 
 
 class ViewProxy(equationbase.BaseViewProxy):
diff --git a/src/Mod/Fem/femsolver/elmer/equations/flux.py b/src/Mod/Fem/femsolver/elmer/equations/flux.py
index 7e937f9493..18f4793368 100644
--- a/src/Mod/Fem/femsolver/elmer/equations/flux.py
+++ b/src/Mod/Fem/femsolver/elmer/equations/flux.py
@@ -46,32 +46,56 @@ class Proxy(linear.Proxy, equationbase.FluxProxy):
     def __init__(self, obj):
         super(Proxy, self).__init__(obj)
         obj.addProperty(
-            "App::PropertyBool", "CalculateFlux",
-            "Flux", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "CalculateFlux",
+            "Flux",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyString", "FluxVariable",
-            "Flux", "Insert variable name for flux calculation")
-        """
-        #obj.addProperty(
-            #"App::PropertyBool", "CalculateFluxAbs",
-            #"Flux", "Select calculation of abs of flux")
-        #obj.addProperty(
-            #"App::PropertyBool", "CalculateFluxMagnitude",
-            #"Flux", "Select calculation of magnitude of flux")
+            "App::PropertyString",
+            "FluxVariable",
+            "Flux",
+            "Insert variable name for flux calculation"
+        )
         """
         obj.addProperty(
-            "App::PropertyBool", "CalculateGrad",
-            "Flux", "Select  calculation of gradient")
+            "App::PropertyBool",
+            "CalculateFluxAbs",
+            "Flux",
+            "Select calculation of abs of flux"
+        )
+        obj.addProperty(
+            "App::PropertyBool",
+            "CalculateFluxMagnitude",
+            "Flux",
+            "Select calculation of magnitude of flux"
+        )
         """
-        #obj.addProperty(
-            #"App::PropertyBool", "CalculateGradAbs",
-            #"Flux", "Select calculation of abs of gradient")
-        #obj.addProperty(
-            #"App::PropertyBool", "CalculateGradMagnitude",
-            #"Flux", "Select calculation of magnitude of gradient")
-        #obj.addProperty(
-            #"App::PropertyBool", "EnforcePositiveMagnitude",
-            #"Flux", "Select calculation of positive magnitude")
+        obj.addProperty(
+            "App::PropertyBool",
+            "CalculateGrad",
+            "Flux",
+            "Select calculation of gradient"
+        )
+        """
+        obj.addProperty(
+            "App::PropertyBool",
+            "CalculateGradAbs",
+            "Flux",
+            "Select calculation of abs of gradient"
+        )
+        obj.addProperty(
+            "App::PropertyBool",
+            "CalculateGradMagnitude",
+            "Flux",
+            "Select calculation of magnitude of gradient"
+        )
+        obj.addProperty(
+            "App::PropertyBool",
+            "EnforcePositiveMagnitude",
+            "Flux",
+            "Select calculation of positive magnitude"
+        )
         """
         obj.Priority = 5
 
diff --git a/src/Mod/Fem/femsolver/elmer/equations/linear.py b/src/Mod/Fem/femsolver/elmer/equations/linear.py
index 7fa410d609..712035027d 100644
--- a/src/Mod/Fem/femsolver/elmer/equations/linear.py
+++ b/src/Mod/Fem/femsolver/elmer/equations/linear.py
@@ -63,46 +63,76 @@ class Proxy(equation.Proxy):
     def __init__(self, obj):
         super(Proxy, self).__init__(obj)
         obj.addProperty(
-            "App::PropertyEnumeration", "LinearSolverType",
-            "Linear System", "Select type of solver for linear system")
+            "App::PropertyEnumeration",
+            "LinearSolverType",
+            "Linear System",
+            "Select type of solver for linear system"
+        )
         obj.LinearSolverType = LINEAR_SOLVER
         obj.LinearSolverType = "Iterative"
         obj.addProperty(
-            "App::PropertyEnumeration", "LinearDirectMethod",
-            "Linear System", "Select type of solver for linear system")
+            "App::PropertyEnumeration",
+            "LinearDirectMethod",
+            "Linear System",
+            "Select type of solver for linear system"
+        )
         obj.LinearDirectMethod = LINEAR_DIRECT
         obj.addProperty(
-            "App::PropertyEnumeration", "LinearIterativeMethod",
-            "Linear System", "Select type of solver for linear system")
+            "App::PropertyEnumeration",
+            "LinearIterativeMethod",
+            "Linear System",
+            "Select type of solver for linear system"
+        )
         obj.LinearIterativeMethod = LINEAR_ITERATIVE
         obj.LinearIterativeMethod = "BiCGStab"
         obj.addProperty(
-            "App::PropertyInteger", "BiCGstablDegree",
-            "Linear System", "Select type of solver for linear system")
+            "App::PropertyInteger",
+            "BiCGstablDegree",
+            "Linear System",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyEnumeration", "LinearPreconditioning",
-            "Linear System", "Select type of solver for linear system")
+            "App::PropertyEnumeration",
+            "LinearPreconditioning",
+            "Linear System",
+            "Select type of solver for linear system"
+        )
         obj.LinearPreconditioning = LINEAR_PRECONDITIONING
         obj.LinearPreconditioning = "ILU0"
         obj.addProperty(
-            "App::PropertyFloat", "LinearTolerance",
-            "Linear System", "Select type of solver for linear system")
+            "App::PropertyFloat",
+            "LinearTolerance",
+            "Linear System",
+            "Select type of solver for linear system"
+        )
         obj.LinearTolerance = 1e-8
         obj.addProperty(
-            "App::PropertyInteger", "LinearIterations",
-            "Linear System", "Select type of solver for linear system")
+            "App::PropertyInteger",
+            "LinearIterations",
+            "Linear System",
+            "Select type of solver for linear system"
+        )
         obj.LinearIterations = 500
         obj.addProperty(
-            "App::PropertyFloat", "SteadyStateTolerance",
-            "Steady State", "Select type of solver for linear system")
+            "App::PropertyFloat",
+            "SteadyStateTolerance",
+            "Steady State",
+            "Select type of solver for linear system"
+        )
         obj.SteadyStateTolerance = 1e-5
         obj.addProperty(
-            "App::PropertyBool", "Stabilize",
-            "Base", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "Stabilize",
+            "Base",
+            "Select type of solver for linear system"
+        )
         obj.Stabilize = True
         obj.addProperty(
-            "App::PropertyBool", "Bubbles",
-            "Base", "Select type of solver for linear system")
+            "App::PropertyBool",
+            "Bubbles",
+            "Base",
+            "Select type of solver for linear system"
+        )
         obj.Bubbles = False
 
 
diff --git a/src/Mod/Fem/femsolver/elmer/equations/nonlinear.py b/src/Mod/Fem/femsolver/elmer/equations/nonlinear.py
index 44541883d1..f15dc4a4d4 100644
--- a/src/Mod/Fem/femsolver/elmer/equations/nonlinear.py
+++ b/src/Mod/Fem/femsolver/elmer/equations/nonlinear.py
@@ -41,20 +41,35 @@ class Proxy(linear.Proxy):
     def __init__(self, obj):
         super(Proxy, self).__init__(obj)
         obj.addProperty(
-            "App::PropertyFloat", "NonlinearTolerance",
-            "Nonlinear System", "Select type of solver for linear system")
+            "App::PropertyFloat",
+            "NonlinearTolerance",
+            "Nonlinear System",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyInteger", "NonlinearIterations",
-            "Nonlinear System", "Select type of solver for linear system")
+            "App::PropertyInteger",
+            "NonlinearIterations",
+            "Nonlinear System",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyFloat", "RelaxationFactor",
-            "Nonlinear System", "Select type of solver for linear system")
+            "App::PropertyFloat",
+            "RelaxationFactor",
+            "Nonlinear System",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyInteger", "NonlinearNewtonAfterIterations",
-            "Nonlinear System", "Select type of solver for linear system")
+            "App::PropertyInteger",
+            "NonlinearNewtonAfterIterations",
+            "Nonlinear System",
+            "Select type of solver for linear system"
+        )
         obj.addProperty(
-            "App::PropertyFloat", "NonlinearNewtonAfterTolerance",
-            "Nonlinear System", "Select type of solver for linear system")
+            "App::PropertyFloat",
+            "NonlinearNewtonAfterTolerance",
+            "Nonlinear System",
+            "Select type of solver for linear system"
+        )
         obj.NonlinearTolerance = 1e-8
         obj.NonlinearIterations = 500
         obj.RelaxationFactor = 1