diff --git a/src/components/Blockly/generator/variables.js b/src/components/Blockly/generator/variables.js
index e5df679..6ff9aad 100644
--- a/src/components/Blockly/generator/variables.js
+++ b/src/components/Blockly/generator/variables.js
@@ -12,6 +12,10 @@ const setVariableFunction = function (defaultValue) {
             Blockly['Arduino'].ORDER_ATOMIC
         );
 
+        const allVars = Blockly.getMainWorkspace().getVariableMap().getAllVariables();
+        const myVar = allVars.filter(v => v.name === variableName)[0]
+
+        Blockly.Arduino.setupCode_[''] = myVar.type + " " + myVar.name + ';\n';
         return variableName + ' = ' + (variableValue || defaultValue) + ';\n';
     };
 };
@@ -25,14 +29,5 @@ const getVariableFunction = function (block) {
     return [variableName, Blockly['Arduino'].ORDER_ATOMIC];
 };
 
-Blockly['Arduino']['variables_set_number'] = setVariableFunction(10);
-Blockly['Arduino']['variables_set_boolean'] = setVariableFunction('true');
-Blockly['Arduino']['variables_set_string'] = setVariableFunction('" "');
-Blockly['Arduino']['variables_set_colour'] = setVariableFunction(
-    `{ 22,  0,  22}`
-);
-
-Blockly['Arduino']['variables_get_number'] = getVariableFunction;
-Blockly['Arduino']['variables_get_boolean'] = getVariableFunction;
-Blockly['Arduino']['variables_get_string'] = getVariableFunction;
-Blockly['Arduino']['variables_get_colour'] = getVariableFunction;
\ No newline at end of file
+Blockly['Arduino']['variables_set_dynamic'] = setVariableFunction()
+Blockly['Arduino']['variables_get_dynamic'] = getVariableFunction;
\ No newline at end of file
diff --git a/src/components/Blockly/toolbox/Toolbox.js b/src/components/Blockly/toolbox/Toolbox.js
index 847bf5b..b72e380 100644
--- a/src/components/Blockly/toolbox/Toolbox.js
+++ b/src/components/Blockly/toolbox/Toolbox.js
@@ -12,25 +12,10 @@ import BlocklyComponent from '../BlocklyComponent';
 
 class Toolbox extends React.Component {
 
-    componentDidMount() {
-        /**
-         
-         const workspace = this.props;
-         console.log()
-         
-         this.props.workspace.registerToolboxCategoryCallback('CREATE_TYPED_VARIABLE', this.createFlyout);
-         
-         const typedVarModal = new TypedVariableModal(workspace, 'callbackName', [["PENGUIN", "Penguin"], ["GIRAFFE", "Giraffe"]]);
-         typedVarModal.init();
-       */
-      console.log(this.props)
-    }
-
     componentDidUpdate() {
-        console.log(this.props)
         this.props.workspace.registerToolboxCategoryCallback('CREATE_TYPED_VARIABLE', this.createFlyout);
          
-         const typedVarModal = new TypedVariableModal(this.props.workspace, 'callbackName', [['char', 'SHORT_NUMBER'], ['int', 'NUMBER'], ['long', 'DECIMAL'], ['String','TEXT'], ['char', 'CHARACTER'], ['boolean', 'BOOLEAN'], [ 'void' , 'NULL'], ['undefined', 'UNDEF']]);
+         const typedVarModal = new TypedVariableModal(this.props.workspace, 'callbackName', [['SHORT_NUMBER', 'char'], ['NUMBER', 'int'], ['DECIMAL', 'long'], ['TEXT', 'String'], ['CHARACTER', 'char'], ['BOOLEAN', 'boolean'], ['NULL', 'void'], ['UNDEF', 'undefined']]);
          typedVarModal.init();
     }
 
@@ -337,9 +322,7 @@ class Toolbox extends React.Component {
                     </Block>
                     <Block type="io_notone"></Block>
                 </Category>
-                <Category name="Colours" custom="CREATE_TYPED_VARIABLE"></Category>    
-                <Category name="Variablen" colour={getColour().variables} custom="CREATE_TYPED_VARIABLE">
-                </Category>`;
+                <Category name="Variablen" colour={getColour().variables} custom="CREATE_TYPED_VARIABLE"></Category>;
                 <sep></sep>
                 <Category name="Input/Output" colour={getColour().io}>
                     <Block type="io_digitalwrite"></Block>