remove log

remove background on focus
fix translations in complie screen (tablet mode)
2022-12-05 13:59:19 +01:00 · 2022-11-25 11:53:04 +01:00 · 2022-11-17 18:12:32 +01:00 · 2022-11-17 17:42:40 +01:00
120 changed files with 831 additions and 1761 deletions
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@ -1,41 +0,0 @@
-name: Build and push image
-on:
-  push:
-    branches:
-      - master
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: catthehacker/ubuntu:act-latest
-    #defaults:
-    #  run:
-    #    working-directory: /repo
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # all history for all branches and tags
-
-      - name: Login to  gitea.simonzeyer.de Repo
-        uses: docker/login-action@v2
-        with:
-          registry: gitea.simonzeyer.de
-          username: ${{ secrets.DOCKER_REPO_USER }}
-          password: ${{ secrets.DOCKER_REPO_PASSWD }}
-
-      - name: Get Meta
-        id: meta
-        run: |
-          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT
-          echo REPO_VERSION=$(git describe --always | sed 's/^v//') >> $GITHUB_OUTPUT          
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        env:
-          ACTIONS_RUNTIME_TOKEN: '' # See https://gitea.com/gitea/act_runner/issues/119
-        with:
-          context: .
-          file: ./Dockerfile     
-          push: true
-          tags: |
-            gitea.simonzeyer.de/schuelerlabor-cleverlab/smarti:${{ steps.meta.outputs.REPO_VERSION }}
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -1,38 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@ -1,20 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/short-issue.md
+++ b/.github/ISSUE_TEMPLATE/short-issue.md
@ -1,14 +0,0 @@
---
-name: Short Issue
-about: Template for Short Issues
-title: ''
-labels: ''
-assignees: ''
-
---
-
-### Current behaviour
-Describe the current behaviour
-
-### Expected behaviour
-Describe how it is supposed to work
--- a/12
+++ b/12
@ -1,12 +0,0 @@
-# specify the node base image with your desired version node:<version>
-FROM node:16 as build
-WORKDIR /app
-copy ./ /app
-RUN npm install  --verbose
-RUN npm run build  --verbose
-
-FROM nginx:alpine
-COPY --from=build /app/build/ /usr/share/nginx/html
-RUN chmod 755 /usr/share/nginx/html/ -R
-EXPOSE 80
-ENTRYPOINT ["sh", "-c", "cd /usr/share/nginx/html/ && nginx -g 'daemon off;'"]
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@ -1,11 +0,0 @@
-# docker-compose.yml
-services:
-  smarti: 
-    mem_limit: 2048m
-    mem_reservation: 128M
-    cpus: 2
-    build:
-      dockerfile: Dockerfile
-    ports:
-    - "80"
-      
--- a/package.json
+++ b/package.json
@ -3,27 +3,24 @@
  "version": "1.0.0",
  "private": true,
  "dependencies": {
-    "@blockly/block-plus-minus": "^4.0.4",
-    "@blockly/field-grid-dropdown": "^2.0.4",
-    "@blockly/field-slider": "4.0.4",
-    "@blockly/plugin-scroll-options": "^3.0.5",
-    "@blockly/plugin-typed-variable-modal": "^5.0.6",
-    "@blockly/workspace-backpack": "^3.0.4",
-    "@blockly/zoom-to-fit": "^3.0.4",
-    "@emotion/react": "^11.10.5",
-    "@emotion/styled": "^11.10.5",
-    "@fortawesome/fontawesome-svg-core": "^6.2.1",
-    "@fortawesome/free-solid-svg-icons": "^6.2.1",
-    "@fortawesome/react-fontawesome": "^0.2.0",
+    "@blockly/block-plus-minus": "^3.0.5",
+    "@blockly/field-grid-dropdown": "^1.0.31",
+    "@blockly/field-slider": "^3.0.5",
+    "@blockly/plugin-scroll-options": "^2.0.5",
+    "@blockly/plugin-typed-variable-modal": "^4.0.5",
+    "@blockly/workspace-backpack": "^2.0.12",
+    "@blockly/zoom-to-fit": "^2.0.14",
+    "@fortawesome/fontawesome-svg-core": "^1.2.36",
+    "@fortawesome/free-solid-svg-icons": "^5.15.4",
+    "@fortawesome/react-fontawesome": "^0.1.19",
+    "@material-ui/core": "^4.12.4",
+    "@material-ui/lab": "^4.0.0-alpha.61",
    "@monaco-editor/react": "^4.3.1",
-    "@mui/lab": "^5.0.0-alpha.110",
-    "@mui/material": "^5.10.16",
-    "@mui/styles": "^5.10.16",
    "@testing-library/jest-dom": "^5.16.1",
    "@testing-library/react": "^12.1.2",
    "@testing-library/user-event": "^7.2.1",
    "axios": "^0.22.0",
-    "blockly": "^9.2.0",
+    "blockly": "^8.0.3",
    "file-saver": "^2.0.5",
    "markdown-it": "^12.3.2",
    "mnemonic-id": "^3.2.7",
@ -32,6 +29,7 @@
    "qrcode.react": "^3.1.0",
    "react": "^17.0.2",
    "react-cookie-consent": "^7.2.1",
+    "react-country-flag": "^3.0.2",
    "react-dom": "^17.0.2",
    "react-markdown": "^8.0.0",
    "react-markdown-editor-lite": "^1.3.3",
@ -39,7 +37,7 @@
    "react-rating-stars-component": "^2.2.0",
    "react-redux": "^7.2.9",
    "react-router-dom": "^5.3.3",
-    "react-scripts": "^5.0.1",
+    "react-scripts": "^5.0.0",
    "react-share": "^4.4.0",
    "react-spinners": "^0.13.3",
    "reactour": "^1.18.7",
@ -70,8 +68,5 @@
    ">0.2%",
    "not dead",
    "not op_mini all"
-  ],
-  "devDependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "7.21.11"
-  }
+  ]
 }
--- a/public/media/hardware/expander.png
+++ b/public/media/hardware/expander.png
--- a/public/media/hardware/jst-qwiic.png
+++ b/public/media/hardware/jst-qwiic.png
--- a/public/media/hardware/qwiic-qwiic.png
+++ b/public/media/hardware/qwiic-qwiic.png
--- a/public/media/hardware/sps30.png
+++ b/public/media/hardware/sps30.png
--- a/public/media/hardware/wassertemp.png
+++ b/public/media/hardware/wassertemp.png
--- a/src/App.css
+++ b/src/App.css
@ -53,7 +53,7 @@ td {
  padding-top: 12px;
  padding-bottom: 12px;
  text-align: left;
-  border-color: #4eaf47;
+  background-color: #4eaf47;
  color: white;
 }

--- a/src/App.js
+++ b/src/App.js
@ -9,7 +9,7 @@ import { loadUser } from "./actions/authActions";

 import "./App.css";

-import { ThemeProvider, StyledEngineProvider, createTheme } from "@mui/material/styles";
+import { ThemeProvider, createTheme } from "@material-ui/core/styles";

 import Content from "./components/Content";

@ -36,7 +36,6 @@ class App extends Component {
  render() {
    const customHistory = createBrowserHistory();
    return (
-      <StyledEngineProvider injectFirst>
      <ThemeProvider theme={theme}>
        <Provider store={store}>
          <Router history={customHistory}>
@ -44,7 +43,6 @@ class App extends Component {
          </Router>
        </Provider>
      </ThemeProvider>
-      </StyledEngineProvider>
    );
  }
 }
--- a/src/actions/workspaceActions.js
+++ b/src/actions/workspaceActions.js
@ -16,7 +16,7 @@ export const onChangeCode = () => (dispatch, getState) => {
  code.arduino = Blockly.Arduino.workspaceToCode(workspace);
  var xmlDom = Blockly.Xml.workspaceToDom(workspace);
  code.xml = Blockly.Xml.domToPrettyText(xmlDom);
-  var selectedBlock = Blockly.getSelected();
+  var selectedBlock = Blockly.selected
  if (selectedBlock !== null) {
    code.helpurl = selectedBlock.helpUrl
    code.tooltip = selectedBlock.tooltip
--- a/src/components/Alert.js
+++ b/src/components/Alert.js
@ -1,9 +1,9 @@
 import React, { Component } from "react";

-import withStyles from '@mui/styles/withStyles';
-import { alpha } from "@mui/material/styles";
+import { withStyles } from "@material-ui/core/styles";
+import { alpha } from "@material-ui/core/styles";

-import Typography from "@mui/material/Typography";
+import Typography from "@material-ui/core/Typography";

 const styles = (theme) => ({
  alert: {
--- a/src/components/Blockly/BlocklyComponent.jsx
+++ b/src/components/Blockly/BlocklyComponent.jsx
@ -27,7 +27,7 @@ import Blockly from "blockly/core";
 import "blockly/blocks";
 import Toolbox from "./toolbox/Toolbox";

-import { Card } from "@mui/material";
+import { Card } from "@material-ui/core";
 import {
  ScrollOptions,
  ScrollBlockDragger,
--- a/src/components/Blockly/BlocklyWindow.js
+++ b/src/components/Blockly/BlocklyWindow.js
@ -45,7 +45,6 @@ class BlocklyWindow extends Component {
    const workspace = Blockly.getMainWorkspace();
    var xml = this.props.initialXml;
    if (props.selectedBoard !== this.props.selectedBoard) {
-       xml = localStorage.getItem("autoSaveXML");
      // change board
      if(!xml) xml = initialXml;
      var xmlDom = Blockly.Xml.textToDom(xml);
@ -63,7 +62,6 @@ class BlocklyWindow extends Component {
    }
    if (props.language !== this.props.language) {
      // change language
-       xml = localStorage.getItem("autoSaveXML");
      if (!xml) xml = initialXml;
       xmlDom = Blockly.Xml.textToDom(xml);
      Blockly.Xml.clearWorkspaceAndLoadFromXml(xmlDom, workspace);
--- a/src/components/Blockly/blocks/CleVerLab.js
+++ b/src/components/Blockly/blocks/CleVerLab.js
@ -1,88 +0,0 @@
-import Blockly from "blockly";
-import { getColour } from "../helpers/colour";
-import * as Types from "../helpers/types";
-import { selectedBoard } from "../helpers/board";
-import { FieldGridDropdown } from "@blockly/field-grid-dropdown";
-
-/**
- * DS18B20 Temperatursonde
- *
- */
-Blockly.Blocks["CleVerLab_dummy1"] = {
- init: function () {
-    this.setColour(getColour().cleverlab);
-    this.appendDummyInput()
-        .appendField("tut nichts")
-    this.setOutput(true, Types.NUMBER.typeName);
-    this.data = {name: "empty"};
-},
-};
-
-
-Blockly.Blocks["CleVerLab_temperature"] = {
-  init: function () {
-    this.setColour(getColour().cleverlab);
-    this.appendDummyInput()
-      .appendField("Temperatur")
-      .appendField("Digital Port:")
-      .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPorts), "DigitalPin");
-    this.setOutput(true, Types.NUMBER.typeName);
-    this.data = {name: "ds18b20"};
-  },
-};
-/**
- * PH Wert
- *
- */
-Blockly.Blocks["CleVerLab_pH"] = {
-  init: function () {
-
-    this.setColour(getColour().cleverlab);
-    this.appendDummyInput()
-      .appendField("pH Wert")
-      .appendField("Digital Port:")
-      .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "DigitalPin");
-    this.setOutput(true, Types.NUMBER.typeName);
-    this.data = {name: "phoderso"};
-  },
-};
-Blockly.Blocks["CleVerLab_cali1"] = {
-    init: function () {
-        this.appendDummyInput()
-            .appendField("Kalibriere pH Sensor");
-        this.appendValueInput("VAR1", "Number")
-            .appendField("Referenzlösung pH 4.00 =")
-            .setAlign(Blockly.ALIGN_RIGHT);
-        this.appendValueInput("VAR2", "Number2")
-            .appendField("Referenzlösung pH 7.00 =")
-            .setAlign(Blockly.ALIGN_RIGHT);
-        this.setPreviousStatement(true, null);
-        this.setNextStatement(true, null);
-        this.setColour(getColour().cleverlab);
-        this.setOutput(true, Types.NUMBER.typeName);
-        this.data = {name: "dsasda"};
-    },
-};
-
-/**
- * Pump
- *
- */
-Blockly.Blocks['CleVerLab_pump'] = {
-  init: function() {
-    this.setColour(getColour().cleverlab);
-        var dropdown = new Blockly.FieldDropdown([
-          [ 'START','HIGH'],
-          [ 'STOPP','LOW']
-        ]);
-    this.appendDummyInput()
-        .appendField(dropdown, "Mode")
-        .appendField(" Pumpe ")
-        .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPins), "DigitalPin");
-    this.setPreviousStatement(true, null);
-    this.setNextStatement(true, null);
-    //this.setOutput(true, "Number");
-    this.setTooltip('');
-    this.setHelpUrl('');
-  }
-};
--- a/src/components/Blockly/blocks/index.js
+++ b/src/components/Blockly/blocks/index.js
@ -10,7 +10,6 @@ import "./sensebox-motors";
 import "./sensebox-lora";
 import "./sensebox-led";
 import "./sensebox-rtc";
-import "./sensebox-ntp";
 import "./sensebox-ble";
 import "./sensebox-sd";
 import "./mqtt";
@ -26,6 +25,5 @@ import "./variables";
 import "./lists";
 import "./watchdog";
 import "./webserver";
-import "./CleVerLab"

 import "../helpers/types";
--- a/src/components/Blockly/blocks/sensebox-ntp.js
+++ b/src/components/Blockly/blocks/sensebox-ntp.js
@ -1,42 +0,0 @@
-import * as Blockly from "blockly";
-import { getColour } from "../helpers/colour";
-import * as Types from "../helpers/types";
-
-Blockly.Blocks["sensebox_ntp_init"] = {
-  init: function () {
-    this.setHelpUrl(Blockly.Msg.sensebox_ntp_helpurl);
-    this.setColour(getColour().time);
-    this.appendDummyInput().appendField(Blockly.Msg.sensebox_ntp_init);
-    this.setPreviousStatement(true);
-    this.setNextStatement(true);
-    this.setTooltip(Blockly.Msg.sensebox_ntp_tooltip);
-  },
-};
-
-Blockly.Blocks["sensebox_ntp_get"] = {
-  init: function () {
-    this.setHelpUrl(Blockly.Msg.sensebox_ntp_get_helpurl);
-    this.setColour(getColour().time);
-    this.appendDummyInput()
-      .appendField(Blockly.Msg.sensebox_ntp_get)
-      .appendField(
-        new Blockly.FieldDropdown([
-          [Blockly.Msg.sensebox_ntp_epochTime, "getEpochTime"],
-          [Blockly.Msg.sensebox_ntp_formattedTimeStamp, "getFormattedTime"],
-        ]),
-        "dropdown"
-      );
-    this.setOutput(true, Types.LARGE_NUMBER.typeName);
-    this.setTooltip(Blockly.Msg.sensebox_rtc_get_tooltip);
-  },
-};
-
-Blockly.Blocks["sensebox_ntp_get_timestamp"] = {
-  init: function () {
-    this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
-    this.setColour(getColour().time);
-    this.appendDummyInput().appendField(Blockly.Msg.sensebox_rtc_get_timestamp);
-    this.setOutput(true);
-    this.setTooltip(Blockly.Msg.sensebox_rtc_get_timestamp_tooltip);
-  },
-};
--- a/src/components/Blockly/blocks/sensebox-rtc.js
+++ b/src/components/Blockly/blocks/sensebox-rtc.js
@ -76,67 +76,3 @@ Blockly.Blocks["sensebox_rtc_get_timestamp"] = {
    this.setTooltip(Blockly.Msg.sensebox_rtc_get_timestamp_tooltip);
  },
 };
-
-/**
- *  Internal RTC
- *
- */
-
-Blockly.Blocks["sensebox_internal_rtc_init"] = {
-  init: function () {
-    this.setHelpUrl(Blockly.Msg.sensebox_internal_rtc_helpurl);
-    this.setColour(getColour().time);
-    this.appendDummyInput().appendField(Blockly.Msg.sensebox_internal_rtc_init);
-    this.setPreviousStatement(true);
-    this.setNextStatement(true);
-    this.setTooltip(Blockly.Msg.sensebox_internal_rtc_init_tooltip);
-  },
-};
-
-Blockly.Blocks["sensebox_internal_rtc_set"] = {
-  init: function () {
-    this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
-    this.setColour(getColour().time);
-    this.appendValueInput("time").appendField(
-      Blockly.Msg.sensebox_internal_rtc_set
-    );
-    this.setPreviousStatement(true);
-    this.setNextStatement(true);
-    this.setTooltip(Blockly.Msg.sensebox_internal_rtc_set_tooltip);
-  },
-};
-
-Blockly.Blocks["sensebox_internal_rtc_get"] = {
-  init: function () {
-    this.setHelpUrl(Blockly.Msg.sensebox_rtc_helpurl);
-    this.setColour(getColour().time);
-    this.appendDummyInput()
-      .appendField(Blockly.Msg.sensebox_internal_rtc_get)
-      .appendField(
-        new Blockly.FieldDropdown([
-          [Blockly.Msg.sensebox_internal_rtc_epoch, "Epoch"],
-          [Blockly.Msg.sensebox_internal_rtc_year, "Year"],
-          [Blockly.Msg.sensebox_internal_rtc_month, "Month"],
-          [Blockly.Msg.sensebox_internal_rtc_day, "Day"],
-          [Blockly.Msg.sensebox_internal_rtc_hour, "Hours"],
-          [Blockly.Msg.sensebox_internal_rtc_minutes, "Minutes"],
-          [Blockly.Msg.sensebox_internal_rtc_seconds, "Seconds"],
-        ]),
-        "dropdown"
-      );
-    this.setOutput(true, Types.LARGE_NUMBER.typeName);
-    this.setTooltip(Blockly.Msg.sensebox_internal_rtc_get_tooltip);
-  },
-};
-
-Blockly.Blocks["sensebox_internal_rtc_get_timestamp"] = {
-  init: function () {
-    this.setHelpUrl(Blockly.Msg.sensebox_internal_rtc_helpurl);
-    this.setColour(getColour().time);
-    this.appendDummyInput().appendField(
-      Blockly.Msg.sensebox_internal_rtc_get_timestamp
-    );
-    this.setOutput(true);
-    this.setTooltip(Blockly.Msg.sensebox_internal_rtc_get_timestamp_tooltip);
-  },
-};
--- a/src/components/Blockly/blocks/sensebox-sensors.js
+++ b/src/components/Blockly/blocks/sensebox-sensors.js
@ -118,7 +118,7 @@ Blockly.Blocks["sensebox_sensor_sds011"] = {
      .appendField(Blockly.Msg.senseBox_sds011_dimension)
      .appendField(
        new Blockly.FieldDropdown(
-          selectedBoard().serialSensors),
+          selectedBoard().serial),
        "SERIAL"
      );
    this.setOutput(true, Types.DECIMAL.typeName);
@ -191,7 +191,7 @@ Blockly.Blocks["sensebox_sensor_bme680_bsec"] = {
    var dropdownOptions = [
      [Blockly.Msg.senseBox_temp, "temperature"],
      [Blockly.Msg.senseBox_hum, "humidity"],
-      [Blockly.Msg.senseBox_bme_pressure, "pressure"],
+      [Blockly.Msg.senseBox_pressure, "pressure"],
      [Blockly.Msg.senseBox_bme_iaq, "IAQ"],
      [Blockly.Msg.senseBox_bme_iaq_accuracy, "IAQAccuracy"],
      [Blockly.Msg.senseBox_bme_co2, "CO2"],
@ -218,7 +218,12 @@ Blockly.Blocks["sensebox_sensor_bme680_bsec"] = {

 Blockly.Blocks["sensebox_sensor_ultrasonic_ranger"] = {
  init: function () {
-    var dropdown = new FieldGridDropdown(selectedBoard().digitalPorts, function (option) {
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_ultrasonic_port_A, "A"],
+      [Blockly.Msg.senseBox_ultrasonic_port_B, "B"],
+      [Blockly.Msg.senseBox_ultrasonic_port_C, "C"],
+    ];
+    var dropdown = new FieldGridDropdown(dropdownOptions, function (option) {
      var input = option === "A" || option === "B" || option === "C";
      this.sourceBlock_.updateShape_(input);
    });
@ -331,7 +336,6 @@ Blockly.Blocks["sensebox_button"] = {
          [Blockly.Msg.senseBox_button_isPressed, "isPressed"],
          [Blockly.Msg.senseBox_button_wasPressed, "wasPressed"],
          [Blockly.Msg.senseBox_button_longPress, "longPress"],
-          [Blockly.Msg.senseBox_button_switch,"toggleButton"]
        ]),
        "FUNCTION"
      )
@ -430,11 +434,16 @@ Blockly.Blocks["sensebox_gps"] = {

 Blockly.Blocks["sensebox_sensor_truebner_smt50"] = {
  init: function () {
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_ultrasonic_port_A, "A"],
+      [Blockly.Msg.senseBox_ultrasonic_port_B, "B"],
+      [Blockly.Msg.senseBox_ultrasonic_port_C, "C"],
+    ];
    this.setColour(getColour().sensebox);
    this.appendDummyInput().appendField(Blockly.Msg.senseBox_smt50);
    this.appendDummyInput()
      .appendField("Port:")
-      .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPorts), "Port");
+      .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port");
    this.appendDummyInput()
      .appendField(Blockly.Msg.senseBox_value)
      .appendField(
@ -458,12 +467,16 @@ Blockly.Blocks["sensebox_sensor_truebner_smt50"] = {

 Blockly.Blocks["sensebox_sensor_watertemperature"] = {
  init: function () {
-
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_ultrasonic_port_A, "A"],
+      [Blockly.Msg.senseBox_ultrasonic_port_B, "B"],
+      [Blockly.Msg.senseBox_ultrasonic_port_C, "C"],
+    ];
    this.setColour(getColour().sensebox);
    this.appendDummyInput()
      .appendField(Blockly.Msg.senseBox_watertemperature)
      .appendField("Port:")
-      .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPorts), "Port");
+      .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port");
    this.setOutput(true, Types.NUMBER.typeName);
    this.setTooltip(Blockly.Msg.senseBox_watertemperature_tip);
    this.data = {name: "ds18b20"};
@ -493,11 +506,16 @@ Blockly.Blocks['sensebox_windspeed'] = {

 Blockly.Blocks["sensebox_soundsensor_dfrobot"] = {
  init: function () {
+    var dropdownOptions = [
+      [Blockly.Msg.senseBox_ultrasonic_port_A, "A"],
+      [Blockly.Msg.senseBox_ultrasonic_port_B, "B"],
+      [Blockly.Msg.senseBox_ultrasonic_port_C, "C"],
+    ];
    this.setColour(getColour().sensebox);
    this.appendDummyInput()
      .appendField(Blockly.Msg.senseBox_soundsensor_dfrobot)
      .appendField("Port:")
-      .appendField(new Blockly.FieldDropdown(selectedBoard().digitalPorts), "Port");
+      .appendField(new Blockly.FieldDropdown(dropdownOptions), "Port");
    this.setOutput(true, Types.DECIMAL.typeName);
    this.setTooltip(Blockly.Msg.senseBox_soundsensor_dfrobot_tooltip);
    this.setHelpUrl(Blockly.Msg.senseBox_soundsensor_dfrobot_helpurl);
@ -555,31 +573,3 @@ Blockly.Blocks["sensebox_sensor_dps310"] = {
    }
  },
 };
-
-/**
- * Sensirion SPS30 Fine Particular Matter Sensor
- * added 02.12.2022 
- */
-
- Blockly.Blocks["sensebox_sensor_sps30"] = {
-  init: function () {
-    this.appendDummyInput().appendField(Blockly.Msg.senseBox_sps30);
-    this.appendDummyInput()
-      .setAlign(Blockly.ALIGN_LEFT)
-      .appendField(Blockly.Msg.senseBox_value)
-      .appendField(
-        new Blockly.FieldDropdown([
-          [Blockly.Msg.senseBox_sps30_1p0, "1p0"],
-          [Blockly.Msg.senseBox_sps30_2p5, "2p5"],
-          [Blockly.Msg.senseBox_sps30_4p0, "4p0"],
-          [Blockly.Msg.senseBox_sps30_10p0, "10p0"],
-        ]),
-        "value"
-      )
-      .appendField(Blockly.Msg.senseBox_sps30_dimension);
-    this.setOutput(true, Types.DECIMAL.typeName);
-    this.setColour(getColour().sensebox);
-    this.setTooltip(Blockly.Msg.senseBox_sps30_tooltip);
-    this.setHelpUrl(Blockly.Msg.senseBox_sps30_helpurl);
-  },
-};
--- a/src/components/Blockly/blocks/variables.js
+++ b/src/components/Blockly/blocks/variables.js
@ -10,7 +10,7 @@ Blockly.Blocks["variables_set_dynamic"] = {
    this.setNextStatement(true, null);
    this.appendValueInput("VALUE")
      .appendField(Blockly.Msg.variables_set, Blockly.Msg.variables_set)
-      .appendField("", "type")
+      // .appendField("", "type")
      .appendField(new Blockly.FieldVariable("VAR"), "VAR")
      .appendField(Blockly.Msg.variables_to);
  },
--- a/src/components/Blockly/generator/CleVerLab.js
+++ b/src/components/Blockly/generator/CleVerLab.js
@ -1,61 +0,0 @@
-import Blockly from "blockly";
-
- /**
-  * starte/stoppe Pumpe
-  *
-  */
-Blockly.Arduino.CleVerLab_pump = function (block) {
-    var pin = block.getFieldValue('DigitalPin');
-    var state = block.getFieldValue("Mode");
-    Blockly['Arduino'].setupCode_['pinMode'] = 'pinMode(' + pin + ', OUTPUT);';
-    var code = 'digitalWrite(' + pin + ', ' + state + ');\n';
-    return code;
-};
-/**
- * PH wert
- *
- */
-Blockly.Arduino.CleVerLab_temperature = function () {
-  var dropdown_pin = this.getFieldValue("DigitalPort");
-  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
-  Blockly.Arduino.libraries_["library_oneWire"] =
-    "#include <OneWire.h> // http://librarymanager/All#OneWire";
-  Blockly.Arduino.libraries_["library_oneDallasTemperature"] =
-    "#include <DallasTemperature.h> // http://librarymanager/All#DallasTemperature";
-  Blockly.Arduino.definitions_["define_OneWire"] =
-    "#define ONE_WIRE_BUS " +
-    dropdown_pin +
-    "\nOneWire oneWire(ONE_WIRE_BUS);\nDallasTemperature sensors(&oneWire);";
-  Blockly.Arduino.setupCode_["sensebox_oneWireSetup"] = "sensors.begin();";
-  Blockly.Arduino.codeFunctions_["sensebox_requestTemp"] =
-    "float getWaterTemp(){\nsensors.requestTemperatures();\nsensors.getTempCByIndex(0);\n}";
-  var code = "getWaterTemp()";
-  return [code, Blockly.Arduino.ORDER_ATOMIC];
-};
-Blockly.Arduino.CleVerLab_pH = function () {
-   var dropdown_pin = this.getFieldValue("DigitalPin");
-   Blockly.Arduino.definitions_["define_pHgetter"] =
-     "#define SensorPin " + dropdown_pin +"\n#define samplingInterval 20\n#define printInterval 800\n#define ArrayLenth  40    //times of collection\nint pHArray[ArrayLenth];   //Store the average value of the sensor feedback\nint pHArrayIndex=0;\nfloat slope = 1.00;\nfloat b =0.00;";
-   Blockly.Arduino.codeFunctions_["sensebox_requestpH"] =
-     "float getpH(){\nstatic unsigned long samplingTime = millis();\nstatic unsigned long printTime = millis();\nstatic float pHValue,voltage;\n//nif(millis()-samplingTime > samplingInterval){\n//pHArray[pHArrayIndex++]=analogRead(SensorPin);\nfor (int i = 1; i <= 10; i += 1) {\nvoltage = voltage + analogRead(SensorPin);\n}\n voltage = (voltage / 10)*5.0/1024; \nsamplingTime=millis();\n\nreturn pHValue = 3.5*voltage*slope+b;\n}\n";
-    Blockly.Arduino.codeFunctions_["avergearraypH"] =
-        "double avergearray(int* arr, int number) {\n int i;\n int max, min;\n double avg;\n long amount = 0;\n if (number <= 0) {\n return 0;\n }\n if (number < 5) {\n for (i = 0; i < number; i++) {\n amount += arr[i];\n }\n avg = amount / number;\n return avg;\n }\n else {\n if (arr[0] < arr[1]) {\n min = arr[0];\n max = arr[1];\n }\n else {\n min = arr[1];\n max = arr[0];\n }\n for (i = 2; i < number; i++) {\n if (arr[i] < min) {\n amount += min;\n min = arr[i];\n }\n else {\n if (arr[i] > max) {\n amount += max;\n max = arr[i];\n }\n else {\n amount += arr[i];\n }\n }\n }\n avg = (double)amount / (number - 2);\n }\n return avg;\n}";
-   var code = "getpH()";
-   return [code, Blockly.Arduino.ORDER_ATOMIC];
-};
-
-Blockly.Arduino.CleVerLab_cali1 = function () {
-   var var1 = Blockly.Arduino.valueToCode(this, 'VAR1', Blockly.Arduino.ORDER_ATOMIC) || "4.00";
-   var var2 = Blockly.Arduino.valueToCode(this, 'VAR2', Blockly.Arduino.ORDER_ATOMIC) || "7.00";
-   //var var1 = this.getFieldValue("VAR1");
-   //var var2 = this.getFieldValue("VAR2");
-   Blockly.Arduino.definitions_["define_pHKali"] = "#define pH4 4.00\n#define pH7 7.00\nfloat pH4is = "+ var1+";\nfloat pH7is = "+ var2 +";";
-   Blockly.Arduino.setupCode_["asdsadsa"] ="slope = (2.00-(4.00/3.50))/(pH7is/3.50 - pH4is/3.50);\n b = 7 - (pH7is * slope);";
-   var code = "0";
-   return [code, Blockly.Arduino.ORDER_ATOMIC];
-};
-
-
-
-
-
--- a/src/components/Blockly/generator/index.js
+++ b/src/components/Blockly/generator/index.js
@ -10,7 +10,6 @@ import "./sensebox-lora";
 import "./sensebox-led";
 import "./sensebox";
 import "./sensebox-rtc";
-import "./sensebox-ntp";
 import "./sensebox-ble";
 import "./sensebox-sd";
 import "./mqtt";
@ -27,4 +26,3 @@ import "./variables";
 import "./lists";
 import "./watchdog";
 import "./webserver";
-import "./CleVerLab"
--- a/src/components/Blockly/generator/math.js
+++ b/src/components/Blockly/generator/math.js
@ -275,15 +275,10 @@ Blockly.Arduino["math_change"] = function (block) {
      "DELTA",
      Blockly.Arduino.ORDER_ADDITIVE
    ) || "0";
-  var id = block.getFieldValue("VAR")
-  const varName = Blockly.Variables.getVariable(
-      Blockly.getMainWorkspace(),
-      id
-    ).name;
-  // var varName = Blockly.Arduino.nameDB_.getName(
-  //   block.getFieldValue("VAR"),
-  //   Blockly.Variables.NAME_TYPE
-  // );
+  var varName = Blockly.Arduino.nameDB_.getName(
+    block.getFieldValue("VAR"),
+    Blockly.Variables.NAME_TYPE
+  );
  return varName + " += " + argument0 + ";\n";
 };

--- a/src/components/Blockly/generator/sensebox-ntp.js
+++ b/src/components/Blockly/generator/sensebox-ntp.js
@ -1,19 +0,0 @@
-import Blockly from "blockly";
-
-Blockly.Arduino.sensebox_ntp_init = function () {
-  Blockly.Arduino.libraries_["WiFiUdp"] = `#include <WiFiUdp.h>`;
-  Blockly.Arduino.libraries_["NTPClient"] = `#include <NTPClient.h>`;
-  Blockly.Arduino.definitions_["WiFiUDP"] = `WiFiUDP ntpUDP;`;
-  Blockly.Arduino.definitions_["NTPClient"] = `NTPClient timeClient(ntpUDP);`;
-  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
-  Blockly.Arduino.setupCode_["timeclient.begin"] = `timeClient.begin();`;
-  Blockly.Arduino.setupCode_["timeclient.update"] = `timeClient.update();`;
-  var code = ``;
-  return code;
-};
-
-Blockly.Arduino.sensebox_ntp_get = function () {
-  var format = this.getFieldValue("dropdown");
-  var code = `timeClient.${format}()`;
-  return [code, Blockly.Arduino.ORDER_ATOMIC];
-};
--- a/src/components/Blockly/generator/sensebox-rtc.js
+++ b/src/components/Blockly/generator/sensebox-rtc.js
@ -94,46 +94,3 @@ uint8_t sec, min, hour, day, month;
  var code = `getTimeStamp()`;
  return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
-
-Blockly.Arduino.sensebox_internal_rtc_init = function () {
-  Blockly.Arduino.libraries_["RTClib"] = `#include <RTCZero.h>`;
-  Blockly.Arduino.definitions_["RTC"] = `RTCZero rtc;`;
-  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
-  Blockly.Arduino.setupCode_["rtc.begin"] = `rtc.begin();`;
-  return "";
-};
-
-Blockly.Arduino.sensebox_internal_rtc_set = function () {
-  var branch =
-    Blockly.Arduino.valueToCode(this, "time", Blockly.Arduino.ORDER_ATOMIC) ||
-    "0";
-  Blockly.Arduino.setupCode_["rtc.setEpoch"] = `rtc.setEpoch(${branch});`;
-  var code = ``;
-  return code;
-};
-
-Blockly.Arduino.sensebox_internal_rtc_get = function () {
-  var dropdown = this.getFieldValue("dropdown");
-  var code = `rtc.get${dropdown}()`;
-  return [code, Blockly.Arduino.ORDER_ATOMIC];
-};
-
-Blockly.Arduino.sensebox_internal_rtc_get_timestamp = function () {
-  Blockly.Arduino.variables_["rtc_timestamp"] = `char timestamp[20];`;
-  Blockly.Arduino.codeFunctions_["getTimeStamp"] = `
-char* getTimeStamp() {
-uint8_t sec, min, hour, day, month;
- uint16_t year;
-sec = rtc.getSeconds();
-min = rtc.getMinutes();
-hour = rtc.getHours();
-day = rtc.getDay();
-month = rtc.getMonth();
-year = rtc.getYear();
- sprintf(timestamp, "%02d-%02d-%02dT%02d:%02d:%02dZ", year, month, day, hour, min, sec);
- return timestamp;
- }
-  `;
-  var code = `getTimeStamp()`;
-  return [code, Blockly.Arduino.ORDER_ATOMIC];
-};
--- a/src/components/Blockly/generator/sensebox-sensors.js
+++ b/src/components/Blockly/generator/sensebox-sensors.js
@ -399,7 +399,6 @@ Blockly.Arduino.sensebox_button = function () {
  Blockly.Arduino.libraries_[
    "library_jcButtons"
  ] = `#include <JC_Button.h> // http://librarymanager/All#JC_Button`;
-
  Blockly.Arduino.definitions_["define_button" + dropdown_pin + ""] =
    "Button button_" + dropdown_pin + "(" + dropdown_pin + ");";
  Blockly.Arduino.setupCode_["setup_button" + dropdown_pin + ""] =
@ -414,10 +413,6 @@ Blockly.Arduino.sensebox_button = function () {
  } else if (dropown_function === "longPress") {
    var time = this.getFieldValue("time");
    code = "button_" + dropdown_pin + ".pressedFor(" + time + ")";
-  } else if (dropown_function === "toggleButton") {
-    code = "button_" + dropdown_pin + ".toggleState()";
-    Blockly.Arduino.definitions_["define_button" + dropdown_pin + ""] =
-    "ToggleButton button_" + dropdown_pin + "(" + dropdown_pin + ");";
  }
  return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
@ -439,8 +434,6 @@ if (airSensor.begin() == false)
    while (1)
      ;
  }`;
-  Blockly.Arduino.setupCode_["scd30_staleData"] =
-    "airSensor.useStaleData(true);";
  var code = "";
  switch (dropdown) {
    case "temperature":
@ -699,57 +692,3 @@ Blockly.Arduino.sensebox_sensor_dps310 = function () {
  }
  return [code, Blockly.Arduino.ORDER_ATOMIC];
 };
-
-/**
- * Sensirion SPS30 Fine Particlar Matter
- *
- */
-
-Blockly.Arduino.sensebox_sensor_sps30 = function () {
-  var dropdown_name = this.getFieldValue("value");
-  Blockly.Arduino.libraries_["library_senseBoxIO"] = "#include <senseBoxIO.h>";
-  Blockly.Arduino.libraries_[
-    "sps30"
-  ] = `#include <sps30.h> // http://librarymanager/All#`;
-  Blockly.Arduino.variables_["sps30_measurement"] =
-    "struct sps30_measurement m;";
-  Blockly.Arduino.variables_["sps30_auto_clean_days"] =
-    "uint32_t auto_clean_days = 4;";
-  Blockly.Arduino.variables_["sps30_interval_intervalsps"] =
-    "const long intervalsps = 1000;";
-  Blockly.Arduino.variables_["sps30_time_startsps"] =
-    "unsigned long time_startsps = 0;";
-  Blockly.Arduino.variables_["sps30_time_actualsps"] =
-    "unsigned long time_actualsps = 0;";
-  Blockly.Arduino.codeFunctions_["sps30_getData"] = `
-void getSPS30Data(){
-
-uint16_t data_ready;
-int16_t ret;
-      
-do {
-    ret = sps30_read_data_ready(&data_ready);
-    if (ret < 0) { 
-    } else if (!data_ready)  {}
-    else
-        break;
-        delay(100); /* retry in 100ms */
-    } while (1);
-    ret = sps30_read_measurement(&m); 
-}
-  `;
-
-  Blockly.Arduino.setupCode_["sps30_begin"] = "sensirion_i2c_init();";
-  Blockly.Arduino.setupCode_["sps30_setFanCleaningInterval"] =
-    "sps30_set_fan_auto_cleaning_interval_days(auto_clean_days);";
-  Blockly.Arduino.setupCode_["sps30_startMeasurement"] =
-    "sps30_start_measurement();";
-  Blockly.Arduino.loopCodeOnce_["getSPS30Data();"] = `
-time_startsps = millis();
-if (time_startsps > time_actualsps + intervalsps) {
-  time_actualsps = millis();
-  getSPS30Data();
-}`;
-  var code = `m.mc_${dropdown_name}`;
-  return [code, Blockly.Arduino.ORDER_ATOMIC];
-};
--- a/src/components/Blockly/helpers/board.js
+++ b/src/components/Blockly/helpers/board.js
@ -13,11 +13,6 @@ const sensebox_mcu = {
    ["C5", "5"],
    ["C6", "6"],
  ],
-  digitalPorts: [
-    ["A", "A"],
-    ["B", "B"],
-    ["C", "C"],
-  ],
  digitalPinsLED: [
    ["BUILTIN_1", "7"],
    ["BUILTIN_2", "8"],
@ -51,13 +46,9 @@ const sensebox_mcu = {
    ["C6", "6"],
  ],
  serial: [
-    ["SerialUSB", "SerialUSB"],
-    ["Serial1", "Serial1"],
-    ["Serial2", "Serial2"],
-  ],
-  serialSensors: [
-    ["Serial1", "Serial1"],
-    ["Serial2", "Serial2"],
+    ["serial", "SerialUSB"],
+    ["serial_1", "Serial1"],
+    ["serial_2", "Serial2"],
  ],
  serialPins: {
    SerialUSB: [
@ -148,9 +139,6 @@ const sensebox_mini = {
    ["IO1", "1"],
    ["IO2", "2"],
  ],
-  digitalPorts: [
-    ["IO1-2", "A"],
-  ],
  digitalPinsLED: [
    ["BUILTIN_1", "7"],
    ["BUILTIN_2", "8"],
@ -159,7 +147,8 @@ const sensebox_mini = {
  ],
  digitalPinsRGB: [
    ["on Board", "6"],
-    ["IO1-2", "1"],
+    ["IO1", "1"],
+    ["IO2", "2"],
  ],
  digitalPinsButton: [
    ["on Board", "0"],
@ -172,11 +161,8 @@ const sensebox_mini = {
    ["IO2", "2"],
  ],
  serial: [
-    ["SerialUSB", "SerialUSB"],
-    ["Serial1", "Serial1"],
-  ],
-  serialSensors: [
-    ["Serial1", "Serial1"],
+    ["serial", "SerialUSB"],
+    ["serial_1", "Serial1"],
  ],
  serialPins: {
    SerialUSB: [
--- a/src/components/Blockly/helpers/colour.js
+++ b/src/components/Blockly/helpers/colour.js
@ -15,7 +15,6 @@ const colours = {
  webserver: 40,
  phyphox: 25,
  motors: 190,
-  cleverlab: 185 ,
 };

 export const getColour = () => {
--- a/src/components/Blockly/helpers/maxInstances.js
+++ b/src/components/Blockly/helpers/maxInstances.js
@ -13,8 +13,6 @@ const maxInstances = {
  sensebox_lora_initialize_otaa: 1,
  sensebox_lora_initialize_abp: 1,
  sensebox_phyphox_init: 1,
-  sensebox_phyphox_experiment: 1,
-  sensebox_phyphox_experiment_send: 1,
  sensebox_ethernet: 1,
 };

--- a/src/components/Blockly/index.js
+++ b/src/components/Blockly/index.js
@ -21,8 +21,8 @@
 * @author samelh@google.com (Sam El-Husseini)
 */

-import React from "react";
-import BlocklyComponent from "./BlocklyComponent";
+ import React from 'react';
+import BlocklyComponent from './BlocklyComponent';

 export default BlocklyComponent;

@ -56,16 +56,4 @@ const Shadow = (p) => {
    return React.createElement("shadow", props, children);
 };

-const Sep = (p) => {
-  const { children, ...props } = p;
-  props.is = "blockly";
-  return React.createElement("sep", props, children);
-};
-
-const Label = (p) => {
-  const { children, ...props } = p;
-  props.is = "blockly";
-  return React.createElement("label", props, children);
-};
-
-export { Block, Category, Value, Field, Shadow, Sep, Label };
+export { Block, Category, Value, Field, Shadow }
--- a/src/components/Blockly/msg/de.js
+++ b/src/components/Blockly/msg/de.js
@ -12,7 +12,6 @@ import { LED } from "./de/sensebox-led";
 import { LORA } from "./de/sensebox-lora";
 import { OSEM } from "./de/sensebox-osem";
 import { RTC } from "./de/sensebox-rtc";
-import { NTP } from "./de/sensebox-ntp";
 import { SD } from "./de/sensebox-sd";
 import { SENSORS } from "./de/sensebox-sensors";
 import { SENSEBOX } from "./de/sensebox";
@ -41,7 +40,6 @@ export const De = {
  ...LORA,
  ...OSEM,
  ...RTC,
-  ...NTP,
  ...SD,
  ...SENSORS,
  ...SENSEBOX,
--- a/src/components/Blockly/msg/de/sensebox-ntp.js
+++ b/src/components/Blockly/msg/de/sensebox-ntp.js
@ -1,11 +0,0 @@
-export const NTP = {
-  sensebox_ntp_init: "Initialisiere NTP",
-  sensebox_ntp_init_tooltip: "Initialisiere den NTP Server.",
-  sensebox_ntp_get: "Hole Zeit von NTP Server: ",
-  sensebox_ntp_get_timestamp_tooltip:
-    "Gibt dir einen in ISO 8601 formatierten Zeitstempel zurück. Bsp: 2021-12-24T18:21Z",
-  sensebox_ntp_get_tooltip:
-    "Gibt dir den ausgewählten Wert zurück. Unix Zeit entspricht der Anzahl der Sekunden seit dem 1.1.1970",
-  sensebox_ntp_epochTime: "Unix Zeit",
-  sensebox_ntp_formattedTimeStamp: "Zeitstempel (hh:mm:ss)",
-};
--- a/src/components/Blockly/msg/de/sensebox-rtc.js
+++ b/src/components/Blockly/msg/de/sensebox-rtc.js
@ -1,14 +1,14 @@
 export const RTC = {
-  sensebox_rtc_init: "Initialisiere externe RTC",
+  sensebox_rtc_init: "Initialisiere RTC",
  sensebox_rtc_init_tooltip:
    "Initialisiere die RTC. Schließe diese an einen der 5 I2C/Wire Anschlüsse an und lege die Batterie ein. Bevor du die Uhrzeit auslesen kannst muss diese zunächst einmal gesetzt werden. Dieser Schritt muss normalerweise nur einmalig durchgeführt werden.",
-  sensebox_rtc_set: "Setze Uhrzeit/Datum der externen RTC",
+  sensebox_rtc_set: "Setze Uhrzeit/Datum der RTC",
  sensebox_rtc_set_tooltip:
    "Stellt die Uhrzeit der RTC ein. Beachte, dass du diesen Block im Setup ausführst.",
-  sensebox_rtc_get_timestamp: "Zeitstempel externe RTC (RFC 3339)",
+  sensebox_rtc_get_timestamp: "Zeitstempel (RFC 3339)",
  sensebox_rtc_get_timestamp_tooltip:
    "Gibt dir einen in ISO 8601 formatierten Zeitstempel zurück. Bsp: 2021-12-24T18:21Z",
-  sensebox_rtc_get: "Wert (externe RTC): ",
+  sensebox_rtc_get: "Wert: ",
  sensebox_rtc_get_tooltip: "Gibt dir den ausgewählten Wert zurück.",
  sensebox_rtc_second: "Sekunden",
  sensebox_rtc_minutes: "Minuten",
@ -16,22 +16,4 @@ export const RTC = {
  sensebox_rtc_day: "Tag",
  sensebox_rtc_month: "Monat",
  sensebox_rtc_year: "Jahr",
-  sensebox_internal_rtc_init: "Initialisiere interne RTC",
-  sensebox_internal_rtc_init_tooltip:
-    "Initialisieren der internen RTC. Diese RTC ist nicht batteriegepuffert und wird bei jedem Einschaltvorgang zurückgesetzt",
-  sensebox_internal_rtc_set: "Setze interne RTC Zeit/Datum (Unix Time)",
-  sensebox_internal_rtc_set_tooltip:
-    "Setzt die Zeit der internen RTC. Führe den Block einmalig im Setup aus und setzte die Uhrzeit über die Unix Zeit.",
-  sensebox_internal_rtc_get: "Wert (interne RTC): ",
-  sensebox_internal_rtc_get_timestamp: "Zeitstempel interne RTC (RFC 3339)",
-  sensebox_internal_rtc_get_timestamp_tooltip:
-    "Returns a timestamp formatted in ISO 8601. Ex: 2021-12-24T18:21Z",
-  sensebox_internal_rtc_get_tooltip: "Gibt den ausgewählten Wert zurück",
-  sensebox_internal_rtc_epoch: "Unix Zeit",
-  sensebox_internal_rtc_year: "Jahr",
-  sensebox_internal_rtc_month: "Monat",
-  sensebox_internal_rtc_day: "Tag",
-  sensebox_internal_rtc_hour: "Stunde",
-  sensebox_internal_rtc_minutes: "Minute",
-  sensebox_internal_rtc_seconds: "Sekunde",
 };
--- a/src/components/Blockly/msg/de/sensebox-sensors.js
+++ b/src/components/Blockly/msg/de/sensebox-sensors.js
@ -140,7 +140,6 @@ Wenn die maximale Distanz überschritten wird, wird ein Wert von **O** ausgegebe
  senseBox_bme_iaq: "Innenraumluftqualität (IAQ)",
  senseBox_bme_iaq_accuracy: "Kalibrierungswert",
  senseBox_bme_co2: "CO2 Äquivalent",
-  senseBox_bme_pressure: "Luftdruck in Pa",
  senseBox_bme_breatheVocEquivalent: "Atemluft VOC Äquivalent",
  senseBox_bme_tooltip: `Schließe den Umweltsensor an einen der 5 **I2C-Anschlüsse** an. **Beachte:** Der Sensor benöigt eine gewisse Zeit zum kalibrieren. 
 Den Status der Kalibrierung kann über den Kalibrierungswert abgelesen werden. Er ist entweder 0, 1, 2 oder 3 und sagt folgendes aus:
@ -176,7 +175,7 @@ Die Messwerte für Temperatur, Luftfeuchtigkeit und Luftdruck können direkt ver
   * Feinstaubsensor (SDS011)
   */

-  senseBox_sds011: "Feinstaubsensor SDS011",
+  senseBox_sds011: "Feinstaubsensor",
  senseBox_sds011_dimension: "in µg/m³ an",
  senseBox_sds011_pm25: "PM2.5",
  senseBox_sds011_pm10: "PM10",
@ -201,23 +200,4 @@ Die Messwerte für Temperatur, Luftfeuchtigkeit und Luftdruck können direkt ver
 - "wurde gedrückt": Mit diesem Modus kannst du abfragen ob der Block gedrückt wurde. Erst wenn der Knopf gedrückt und wieder losgelassen wurde erhältst du TRUE zurück
 - "als Schalter": Wenn du diesen Block verwendest kannst du den Knopf wie ein Lichtschalter verwenden. Der Status wird gespeichert bis der Button erneut gedrückt wird`,
  senseBox_button_helpurl: "",
-
-
-
-  /**
-   * Feinstaubsensor Sensirion SPS30
-   */
-
-   senseBox_sps30: "Feinstaubsensor Sensirion SPS30",
-   senseBox_sps30_dimension: "in µg/m³",
-   senseBox_sps30_1p0: "PM1.0",
-   senseBox_sps30_2p5: "PM2.5",
-   senseBox_sps30_4p0: "PM4.0",
-   senseBox_sps30_10p0: "PM10",
-   senseBox_sps30_tooltip:"Dieser Block gibt dir den Messwert des Sensirion SPS30 Feinstaubsensor. Schließe den Feinstaubsensor an einen der 5 **I2C** Anschlüssen an. Im Dropdown Menü zwischen PM1.0, PM2.5, PM4.0 und PM10 auswählen. Der Messwert wird dir als **Kommazahl** in µg/m3",
-    senseBox_sps30_helpurl:
-     "https://docs.sensebox.de/hardware/sensoren-feinstaub/",
- 
-
-
 };
--- a/src/components/Blockly/msg/de/ui.js
+++ b/src/components/Blockly/msg/de/ui.js
@ -8,15 +8,11 @@ export const UI = {
  toolbox_math: "Mathematik",
  toolbox_io: "Eingang/Ausgang",
  toolbox_time: "Zeit",
-  toolbox_rtc: "RTC",
-  toolbox_ntp: "NTP",
  toolbox_functions: "Funktionen",
  toolbox_variables: "Variablen",
  toolbox_serial: "Seriell",
  toolbox_advanced: "Erweitert",
  toolbox_motors: "Motoren",
-  toolbox_label_externalRTC: "Externe RTC",
-  toolbox_label_internalRTC: "Interne RTC",
  variable_NUMBER: "Zahl (int)",
  variable_SHORT_NUMBER: "char",
  variable_LONG: "große Zahl (long)",
@ -103,11 +99,14 @@ export const UI = {
   * Tablet Dialog
   */

+  tabletDialog_connect: "senseBox Connect App öffnen",
  tabletDialog_headline: "Tablet Modus ist aktiviert!",
  tabletDialog_text:
    "Der Tablet Modus wurde aktiviert. Du kannst nun Programmcodes über die senseBox Connect App auf deine senseBox kopieren. Der Tablet Modus kann in den Einstellungen deaktiviert werden",
  tabletDialog_more:
    "Weitere Informationen und den Link zum Download der App findest du unter: ",
+  compiledialog_process: "Dein Code wird compiliert!",
+  compiledialog_instructions: "Übertrage ihn anschließend mithlfe der senseBoxConnect-App..",

  /**
   * Reset Dialog
@ -136,7 +135,7 @@ export const UI = {
   * Compile Dialog
   *
   */
-
+   compiledialog_success: "Dein Programm wurde erfolgreich kompiliert.",
  compiledialog_headline: "Fehler",
  compiledialog_text:
    "Beim kompilieren ist ein Fehler aufgetreten. Überprüfe deine Blöcke und versuche es erneut",
@ -316,8 +315,7 @@ export const UI = {
   * Device Selction
   *  */
  deviceselection_head: "Welches Board benutzt du?",
-  deviceselection_keep_selection:
-    "Speichere meine Auswahl fürs nächste Mal (Du kannst das Board später in den Einstellungen wechseln)",
+  deviceselection_keep_selection: "Speichere meine Auswahl fürs nächste Mal (Du kannst das Board später in den Einstellungen wechseln)",
  deviceselection_footnote: "Hier kommst du zur alten Blockly Version für den ",
  deviceselection_footnote_02: "oder die",

--- a/src/components/Blockly/msg/en.js
+++ b/src/components/Blockly/msg/en.js
@ -13,7 +13,6 @@ import { LED } from "./en/sensebox-led";
 import { LORA } from "./en/sensebox-lora";
 import { OSEM } from "./en/sensebox-osem";
 import { RTC } from "./en/sensebox-rtc";
-import { NTP } from "./en/sensebox-ntp";
 import { SD } from "./en/sensebox-sd";
 import { SENSORS } from "./en/sensebox-sensors";
 import { TELEGRAM } from "./en/sensebox-telegram";
@ -41,7 +40,6 @@ export const En = {
  ...LORA,
  ...OSEM,
  ...RTC,
-  ...NTP,
  ...SD,
  ...SENSORS,
  ...SENSEBOX,
--- a/src/components/Blockly/msg/en/CleVerLab.js
+++ b/src/components/Blockly/msg/en/CleVerLab.js
@ -1,3 +0,0 @@
-export const CLEVERLAB = {
-
-}
--- a/src/components/Blockly/msg/en/io.js
+++ b/src/components/Blockly/msg/en/io.js
@ -13,8 +13,8 @@ export const IO = {
  ARD_DIGITALREAD_TIP: "Read digital value on a pin: HIGH or LOW",
  ARD_DIGITALWRITE: "set digitial pin#",
  ARD_DIGITALWRITE_TIP: "Write digital value HIGH or LOW to a specific Port",
-  ARD_FUN_RUN_LOOP: "Arduino loop forever:",
-  ARD_FUN_RUN_SETUP: "Arduino run first:",
+  ARD_FUN_RUN_LOOP: "Loop()",
+  ARD_FUN_RUN_SETUP: "Setup()",
  ARD_FUN_RUN_TIP: "Defines the Arduino setup() and loop() functions.",
  ARD_HIGH: "HIGH",
  ARD_HIGHLOW_TIP: "Set a pin state logic High or Low.",
--- a/src/components/Blockly/msg/en/sensebox-ntp.js
+++ b/src/components/Blockly/msg/en/sensebox-ntp.js
@ -1,10 +0,0 @@
-export const NTP = {
-  sensebox_ntp_init: "Initialise NTP",
-  sensebox_ntp_init_tooltip:
-    "Initialisiere die RTC. Schließe diese an einen der 5 I2C/Wire Anschlüsse an und lege die Batterie ein. Bevor du die Uhrzeit auslesen kannst muss diese zunächst einmal gesetzt werden. Dieser Schritt muss normalerweise nur einmalig durchgeführt werden.",
-  sensebox_ntp_get: "Get time from NTP Server: ",
-  sensebox_ntp_get_tooltip:
-    "Gibt dir den ausgewählten Wert zurück. Unix Zeit entspricht der Anzahl der Sekunden seit dem 1.1.1970",
-  sensebox_ntp_epochTime: "Unix time",
-  sensebox_ntp_formattedTimeStamp: "Timestamp (hh:mm:ss)",
-};
--- a/src/components/Blockly/msg/en/sensebox-rtc.js
+++ b/src/components/Blockly/msg/en/sensebox-rtc.js
@ -1,11 +1,11 @@
 export const RTC = {
-  sensebox_rtc_init: "Initialise external RTC",
+  sensebox_rtc_init: "Initialise RTC",
  sensebox_rtc_init_tooltip:
    "Initialise the RTC. Connect it to one of the 5 I2C/Wire connections and insert the battery. Before you can read out the time, it must first be set. This step usually only needs to be done once.",
  sensebox_rtc_set: "Set RTC time/date:",
  sensebox_rtc_set_tooltip:
    "Sets the time of the RTC. Note that you execute this block in the setup.",
-  sensebox_rtc_get_timestamp: "Timestamp external RTC (RFC 3339)",
+  sensebox_rtc_get_timestamp: "Get timestamp",
  sensebox_rtc_get_timestamp_tooltip:
    "Returns a timestamp formatted in ISO 8601. Ex: 2021-12-24T18:21Z",
  sensebox_rtc_get_tooltip: "Returns the selected value",
@ -17,22 +17,4 @@ export const RTC = {
  sensebox_rtc_day: "day",
  sensebox_rtc_month: "month",
  sensebox_rtc_year: "year",
-  sensebox_internal_rtc_init: "Initialise internal RTC",
-  sensebox_internal_rtc_init_tooltip:
-    "Initialise the internal RTC. This RTC is not battery backed and will be reset on every power cycle.",
-  sensebox_internal_rtc_set: "Set internal RTC time/date:",
-  sensebox_internal_rtc_set_tooltip:
-    "Sets the time of the internal RTC. Note that you execute this block in the setup.",
-  sensebox_internal_rtc_get: "Get: ",
-  sensebox_internal_rtc_get_timestamp: "Timestamp internal RTC (RFC 3339)",
-  sensebox_internal_rtc_get_timestamp_tooltip:
-    "Returns a timestamp formatted in ISO 8601. Ex: 2021-12-24T18:21Z",
-  sensebox_internal_rtc_get_tooltip: "Returns the selected value",
-  sensebox_internal_rtc_epoch: "Unix Time",
-  sensebox_internal_rtc_year: "year",
-  sensebox_internal_rtc_month: "month",
-  sensebox_internal_rtc_day: "day",
-  sensebox_internal_rtc_hour: "hour",
-  sensebox_internal_rtc_minutes: "minutes",
-  sensebox_internal_rtc_seconds: "seconds",
 };
--- a/src/components/Blockly/msg/en/sensebox-sensors.js
+++ b/src/components/Blockly/msg/en/sensebox-sensors.js
@ -141,7 +141,6 @@ If the max distance is reached the a value of **O** will be returned`,
  senseBox_bme680: "Environmental sensor (BME680)",
  senseBox_bme_iaq: "Indoor Air Quality (IAQ)",
  senseBox_bme_iaq_accuracy: "Calibration Value",
-  senseBox_bme_pressure: "Airpressure in Pa",
  senseBox_bme_co2: "CO2 Equivalent",
  senseBox_bme_breatheVocEquivalent: "Breathe VOC Equivalent",
  senseBox_bme_tooltip: `Connect the environmental sensor to one of the 5 **I2C ports**. **Note:** The sensor needs some time to calibrate. 
@ -206,23 +205,4 @@ The measured values for temperature, humidity and air pressure can be used direc
   *
   */
  senseBox_watertemperature: "Water Temperature",
-
-
-    /**
-   * Feinstaubsensor Sensirion SPS30
-   */
-
-     senseBox_sps30: "Particulate Matter Sensor (Sensirion SPS30)",
-     senseBox_sps30_dimension: "in µg/m³",
-     senseBox_sps30_1p0: "PM1.0",
-     senseBox_sps30_2p5: "PM2.5",
-     senseBox_sps30_4p0: "PM4.0",
-     senseBox_sps30_10p0: "PM10",
-     senseBox_sps30_tooltip:
-     "This block gives you the measured value of the Sensirion SPS30 fine dust sensor. Connect the fine dust sensor to one of the 5 **I2C** connectors. Select between PM1.0, PM2.5, PM4.0 and PM10 in the dropdown menu. The measured value will be displayed as **decimal** in µg/m3",
-     senseBox_sps30_helpurl:
-       "https://docs.sensebox.de/hardware/sensoren-feinstaub/",
-   
-  
-
 };
--- a/src/components/Blockly/msg/en/ui.js
+++ b/src/components/Blockly/msg/en/ui.js
@ -8,15 +8,11 @@ export const UI = {
  toolbox_math: "Math",
  toolbox_io: "Input/Output",
  toolbox_time: "Time",
-  toolbox_rtc: "RTC",
-  toolbox_ntp: "NTP",
  toolbox_functions: "Functions",
  toolbox_variables: "Variables",
  toolbox_serial: "Serial",
  toolbox_advanced: "Erweitert",
  toolbox_motors: "Motors",
-  toolbox_label_externalRTC: "External RTC",
-  toolbox_label_internalRTC: "Internal RTC",
  variable_NUMBER: "Number (int)",
  variable_SHORT_NUMBER: "char",
  variable_LONG: "Big number (long)",
@ -105,6 +101,7 @@ export const UI = {
    "Tablet mode has been activated. You can now copy program codes to your senseBox via the senseBox Connect app. Tablet mode can be deactivated in the settings",
  tabletDialog_more:
    "For more information and the link to download the app, please visit: ",
+  tabletDialog_connect: "Open senseBox Connect App",

  /**
   * Reset Dialog
@ -132,10 +129,12 @@ export const UI = {
   * Compile Dialog
   *
   */
-
+  compiledialog_success: "Your code has been compiled successfully.",
  compiledialog_headline: "Error",
  compiledialog_text:
    "While compiling an error occured. Please check your blocks and try again",
+  compiledialog_process: "Your code is being compiled!",
+  compiledialog_instructions: "After that, transfer it using the senseBoxConnect app.",

  /**
   * Buttons
@ -308,14 +307,11 @@ export const UI = {
    "Your code will now be compiled and then downloaded to your computer",

  /**
-  * Device Selection
+  * Device Selction
  * */ 
-
  deviceselection_head: "Which board are you using?",
-  deviceselection_keep_selection:
-    "Save my choice (You can change the board later in the settings)",
-  deviceselection_footnote:
-    "Here you can access the old blockly Version for the",
+  deviceselection_keep_selection: "Save my choice (You can change the board later in the settings)",
+  deviceselection_footnote: "Here you can access the old blockly Version for the",
  deviceselection_footnote_02: "or the",

  /**
--- a/src/components/Blockly/toolbox/Toolbox.js
+++ b/src/components/Blockly/toolbox/Toolbox.js
@ -1,5 +1,5 @@
 import React from "react";
-import { Block, Value, Field, Shadow, Category, Sep, Label } from "../";
+import { Block, Value, Field, Shadow, Category } from "../";
 import { getColour } from "../helpers/colour";
 import "@blockly/block-plus-minus";
 import { TypedVariableModal } from "@blockly/plugin-typed-variable-modal";
@ -61,7 +61,6 @@ class Toolbox extends React.Component {
          <Block type="sensebox_sensor_uv_light" />
          <Block type="sensebox_sensor_bmx055_accelerometer" />
          <Block type="sensebox_sensor_sds011" />
-          <Block type="sensebox_sensor_sps30" />
          <Block type="sensebox_sensor_pressure" />
          <Block type="sensebox_sensor_dps310" />
          <Block type="sensebox_sensor_bme680_bsec" />
@ -503,12 +502,6 @@ class Toolbox extends React.Component {
          <Block type="time_micros"></Block>
          <Block type="infinite_loop"></Block>
          <Block type="sensebox_interval_timer"></Block>
-          <Category
-            id="time"
-            name={Blockly.Msg.toolbox_rtc}
-            colour={getColour().time}
-          >
-            <Label text={Blockly.Msg.toolbox_label_externalRTC}></Label>
          <Block type="sensebox_rtc_init"></Block>
          <Block type="sensebox_rtc_set">
            <Value name="second">
@ -545,21 +538,6 @@ class Toolbox extends React.Component {
          {/* <Block type="sensebox_rtc_set_ntp"></Block> */}
          <Block type="sensebox_rtc_get"></Block>
          <Block type="sensebox_rtc_get_timestamp"></Block>
-            <Sep gap="40"></Sep>
-            <Label text={Blockly.Msg.toolbox_label_internalRTC}></Label>
-            <Block type="sensebox_internal_rtc_init"></Block>
-            <Block type="sensebox_internal_rtc_set"></Block>
-            <Block type="sensebox_internal_rtc_get"></Block>
-            <Block type="sensebox_internal_rtc_get_timestamp"></Block>
-          </Category>
-          <Category
-            id="timeUTP"
-            name={Blockly.Msg.toolbox_ntp}
-            colour={getColour().time}
-          >
-            <Block type="sensebox_ntp_init"></Block>
-            <Block type="sensebox_ntp_get"></Block>
-          </Category>
        </Category>
        <Category
          id="math"
@ -633,11 +611,7 @@ class Toolbox extends React.Component {
          colour={getColour().procedures}
          custom="PROCEDURE"
        ></Category>
-        <Category name="CleVerLab" colour={getColour().cleverlab}>
-           <Block type="CleVerLab_pH" />
-           <Block type="CleVerLab_pump" />
-           <Block type="CleVerLab_cali1" />
-        </Category>
+        <sep></sep>
        <Category name={Blockly.Msg.toolbox_advanced} colour={getColour().io}>
          <Category
            name={Blockly.Msg.toolbox_serial}
@ -669,10 +643,7 @@ class Toolbox extends React.Component {
              </Value>
            </Block>
          </Category>
-          <Category
-            name={Blockly.Msg.toolbox_motors}
-            colour={getColour().motors}
-          >
+          <Category name={Blockly.Msg.toolbox_motors} colour={getColour().motors}>
          <Block type="sensebox_motors_beginServoMotor" />
          <Block type="sensebox_motors_moveServoMotor">
            <Value name="degrees">
--- a/src/components/Breadcrumbs.js
+++ b/src/components/Breadcrumbs.js
@ -3,9 +3,9 @@ import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
 import clsx from 'clsx';

-import withStyles from '@mui/styles/withStyles';
-import MaterialUIBreadcrumbs from '@mui/material/Breadcrumbs';
-import Typography from '@mui/material/Typography';
+import { withStyles } from '@material-ui/core/styles';
+import MaterialUIBreadcrumbs from '@material-ui/core/Breadcrumbs';
+import Typography from '@material-ui/core/Typography';

 import { faHome } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
--- a/src/components/CodeEditor/CodeEditor.js
+++ b/src/components/CodeEditor/CodeEditor.js
@ -2,11 +2,11 @@ import React from "react";
 import { useState, useRef } from "react";
 import { default as MonacoEditor } from "@monaco-editor/react";
 import { withRouter } from "react-router-dom";
-import { Button, Grid } from "@mui/material";
+import { Button, Grid } from "@material-ui/core";
 import Blockly from "blockly/core";
-import Divider from "@mui/material/Divider";
+import Divider from "@material-ui/core/Divider";
 import { saveAs } from "file-saver";
-import Drawer from "@mui/material/Drawer";
+import Drawer from "@material-ui/core/Drawer";
 import Sidebar from "./Sidebar";
 import Dialog from "../Dialog";
 import SaveIcon from "./SaveIcon";
--- a/src/components/CodeEditor/Compile.js
+++ b/src/components/CodeEditor/Compile.js
@ -5,19 +5,19 @@ import { workspaceName } from "../../actions/workspaceActions";

 import { detectWhitespacesAndReturnReadableResult } from "../../helpers/whitespace";

-import withStyles from '@mui/styles/withStyles';
-import Button from "@mui/material/Button";
-import Backdrop from "@mui/material/Backdrop";
-import CircularProgress from "@mui/material/CircularProgress";
-import IconButton from "@mui/material/IconButton";
-import Tooltip from "@mui/material/Tooltip";
-import Divider from "@mui/material/Divider";
+import { withStyles } from "@material-ui/core/styles";
+import Button from "@material-ui/core/Button";
+import Backdrop from "@material-ui/core/Backdrop";
+import CircularProgress from "@material-ui/core/CircularProgress";
+import IconButton from "@material-ui/core/IconButton";
+import Tooltip from "@material-ui/core/Tooltip";
+import Divider from "@material-ui/core/Divider";
 import { faClipboardCheck } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import * as Blockly from "blockly/core";
 import Copy from "../copy.svg";

-import MuiDrawer from "@mui/material/Drawer";
+import MuiDrawer from "@material-ui/core/Drawer";
 import Dialog from "../Dialog";

 const styles = (theme) => ({
@ -188,7 +188,7 @@ class Compile extends Component {
            <IconButton
              className={`compileBlocks ${this.props.classes.iconButton}`}
              onClick={() => this.compile()}
-              size="large">
+            >
              <FontAwesomeIcon icon={faClipboardCheck} size="xs" />
            </IconButton>
          </Tooltip>
@ -201,7 +201,6 @@ class Compile extends Component {
          >
            <FontAwesomeIcon
              icon={faClipboardCheck}
-              
              style={{ marginRight: "5px" }}
            />{" "}
            Kompilieren
@ -233,8 +232,8 @@ class Compile extends Component {
          >
            <div className="overlay">
              {/* <img src={Copy} width="400" alt="copyimage"></img> */}
-              <h2>Dein Code wird kompiliert!</h2>
-              <p>übertrage ihn anschließend mithlfe der senseBoxConnect-App</p>
+              <h2>{Blockly.Msg.compiledialog_process}</h2>
+              <p>{Blockly.Msg.compiledialog_instructions}</p>
              <p>
                {Blockly.Msg.compile_overlay_help}
                <a href="/faq" target="_blank">
@ -292,7 +291,7 @@ class Compile extends Component {
          button={Blockly.Msg.button_close}
        >
          <div>
-            <p>Dein Code wurde erfolgreich kompiliert</p>
+            <p>{Blockly.Msg.compiledialog_success}</p>
            <a href={this.state.link}>
              <Button
                style={{ color: "white" }}
@ -302,10 +301,9 @@ class Compile extends Component {
              >
                <FontAwesomeIcon
                  icon={faClipboardCheck}
-                  
                  style={{ marginRight: "5px" }}
                />{" "}
-                Starte Übertragung
+                {Blockly.Msg.tabletDialog_connect}
              </Button>
            </a>
          </div>
--- a/src/components/CodeEditor/SaveIcon.js
+++ b/src/components/CodeEditor/SaveIcon.js
@ -1,6 +1,6 @@
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faCircleNotch, faSave } from "@fortawesome/free-solid-svg-icons";
-import Tooltip from "@mui/material/Tooltip";
+import Tooltip from "@material-ui/core/Tooltip";
 import React from "react";

 const SaveIcon = ({ loading }) => (
@ -17,7 +17,6 @@ const SaveIcon = ({ loading }) => (
        <FontAwesomeIcon
          style={{ position: "absolute" }}
          icon={faCircleNotch}
-          
          spin={true}
          size="2x"
          color="grey"
@ -31,7 +30,6 @@ const SaveIcon = ({ loading }) => (
          transform: "translate(-50%,-50%)",
        }}
        icon={faSave}
-        
        color={loading ? "grey" : "green"}
        size={loading ? "1x" : "lg"}
      />
--- a/src/components/CodeEditor/SerialMonitor.js
+++ b/src/components/CodeEditor/SerialMonitor.js
@ -1,5 +1,5 @@
 import { useState } from "react";
-import Button from "@mui/material/Button";
+import Button from "@material-ui/core/Button";

 const SerialMonitor = () => {
  const [serialPortContent, setSerialPortContent] = useState([]);
--- a/src/components/CodeEditor/Sidebar.js
+++ b/src/components/CodeEditor/Sidebar.js
@ -1,13 +1,13 @@
 import React from "react";
 import Blockly from "blockly";
 import { useSelector } from "react-redux";
-import Accordion from "@mui/material/Accordion";
-import AccordionSummary from "@mui/material/AccordionSummary";
-import AccordionDetails from "@mui/material/AccordionDetails";
-import Typography from "@mui/material/Typography";
+import Accordion from "@material-ui/core/Accordion";
+import AccordionSummary from "@material-ui/core/AccordionSummary";
+import AccordionDetails from "@material-ui/core/AccordionDetails";
+import Typography from "@material-ui/core/Typography";
 import { LibraryVersions } from "../../data/versions.js";
 import { useMonaco } from "@monaco-editor/react";
-import { Button } from "@mui/material";
+import { Button } from "@material-ui/core";
 import SerialMonitor from "./SerialMonitor.js";
 import axios from "axios";

--- a/src/components/CodeViewer.js
+++ b/src/components/CodeViewer.js
@ -2,17 +2,15 @@ import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";

-import withStyles from '@mui/styles/withStyles';
-import MuiAccordion from "@mui/material/Accordion";
-import MuiAccordionSummary from "@mui/material/AccordionSummary";
-import MuiAccordionDetails from "@mui/material/AccordionDetails";
-import { Card } from "@mui/material";
+import withWidth from "@material-ui/core/withWidth";
+import { withStyles } from "@material-ui/core/styles";
+import MuiAccordion from "@material-ui/core/Accordion";
+import MuiAccordionSummary from "@material-ui/core/AccordionSummary";
+import MuiAccordionDetails from "@material-ui/core/AccordionDetails";
+import { Card } from "@material-ui/core";
 import * as Blockly from "blockly";
 import { default as MonacoEditor } from "@monaco-editor/react";

-// FIXME checkout https://mui.com/components/use-media-query/#migrating-from-withwidth
-const withWidth = () => (WrappedComponent) => (props) => <WrappedComponent {...props} width="xs" />;
-
 const Accordion = withStyles((theme) => ({
  root: {
    border: `1px solid ${theme.palette.secondary.main}`,
--- a/src/components/DeviceSelection.js
+++ b/src/components/DeviceSelection.js
@ -3,9 +3,9 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import Dialog from "./Dialog";

-import withStyles from '@mui/styles/withStyles';
+import { withStyles } from "@material-ui/core/styles";
 import * as Blockly from "blockly";
-import { IconButton, Grid, Avatar, Typography } from "@mui/material";
+import { IconButton, Grid, Avatar, Typography } from "@material-ui/core";
 import { setBoard } from "../actions/boardAction";

 const styles = (theme) => ({
@ -67,7 +67,7 @@ class DeviceSeclection extends Component {
        <div>
          <Grid container spacing={2} style={{ textAlign: "center" }}>
            <Grid item xs={6}>
-              <IconButton onClick={(e) => this.onclick(e, "mcu")} size="large">
+              <IconButton onClick={(e) => this.onclick(e, "mcu")}>
                <Avatar
                  alt="Sensebox MCU"
                  src="/media/hardware/senseboxmcu.png"
@ -95,7 +95,7 @@ class DeviceSeclection extends Component {
              <p>Sensebox ESP</p>
            </Grid> */}
            <Grid item xs={6}>
-              <IconButton onClick={(e) => this.onclick(e, "mini")} size="large">
+              <IconButton onClick={(e) => this.onclick(e, "mini")}>
                <Avatar
                  alt="Sensebox Mini"
                  src="/media/hardware/senseboxmcumini.png"
--- a/src/components/Dialog.js
+++ b/src/components/Dialog.js
@ -1,10 +1,10 @@
 import React, { Component } from 'react';

-import Button from '@mui/material/Button';
-import DialogTitle from '@mui/material/DialogTitle';
-import DialogContent from '@mui/material/DialogContent';
-import DialogActions from '@mui/material/DialogActions';
-import MaterialUIDialog from '@mui/material/Dialog';
+import Button from '@material-ui/core/Button';
+import DialogTitle from '@material-ui/core/DialogTitle';
+import DialogContent from '@material-ui/core/DialogContent';
+import DialogActions from '@material-ui/core/DialogActions';
+import MaterialUIDialog from '@material-ui/core/Dialog';

 class Dialog extends Component {

--- a/src/components/Faq.js
+++ b/src/components/Faq.js
@ -4,15 +4,15 @@ import Breadcrumbs from "./Breadcrumbs";

 import { withRouter } from "react-router-dom";

-import Button from "@mui/material/Button";
-import Typography from "@mui/material/Typography";
+import Button from "@material-ui/core/Button";
+import Typography from "@material-ui/core/Typography";
 import * as Blockly from "blockly";
 import ReactMarkdown from "react-markdown";
 import rehypeRaw from "rehype-raw";
-import Container from "@mui/material/Container";
-import Accordion from "@mui/material/Accordion";
-import AccordionSummary from "@mui/material/AccordionSummary";
-import AccordionDetails from "@mui/material/AccordionDetails";
+import Container from "@material-ui/core/Container";
+import ExpansionPanel from "@material-ui/core/ExpansionPanel";
+import ExpansionPanelSummary from "@material-ui/core/ExpansionPanelSummary";
+import ExpansionPanelDetails from "@material-ui/core/ExpansionPanelDetails";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faChevronDown } from "@fortawesome/free-solid-svg-icons";
 import { FaqQuestions } from "../data/faq";
@ -47,16 +47,16 @@ class Faq extends Component {
            <h1>FAQ</h1>
            {FaqQuestions().map((object, i) => {
              return (
-                <Accordion
+                <ExpansionPanel
                  expanded={panel === `panel${i}`}
                  onChange={() => this.handleChange(`panel${i}`)}
                >
-                  <AccordionSummary
+                  <ExpansionPanelSummary
                    expandIcon={<FontAwesomeIcon icon={faChevronDown} />}
                  >
                    <Typography variant="h6">{object.question}</Typography>
-                  </AccordionSummary>
-                  <AccordionDetails>
+                  </ExpansionPanelSummary>
+                  <ExpansionPanelDetails>
                    <Typography>
                      <ReactMarkdown
                        className="news"
@ -65,8 +65,8 @@ class Faq extends Component {
                        rehypePlugins={[rehypeRaw]}
                      ></ReactMarkdown>
                    </Typography>
-                  </AccordionDetails>
-                </Accordion>
+                  </ExpansionPanelDetails>
+                </ExpansionPanel>
              );
            })}
            {this.props.button ? (
--- a/src/components/Footer.js
+++ b/src/components/Footer.js
@ -2,7 +2,7 @@ import React, { Component } from 'react';

 import { Link } from 'react-router-dom';

-import Typography from '@mui/material/Typography';
+import Typography from '@material-ui/core/Typography';

 class Footer extends Component {
  render() {
--- a/src/components/Home.js
+++ b/src/components/Home.js
@ -14,10 +14,10 @@ import TrashcanButtons from "./Workspace/TrashcanButtons";
 // import HintTutorialExists from "./Tutorial/HintTutorialExists";
 import DeviceSelection from "./DeviceSelection";

-import Grid from "@mui/material/Grid";
-import IconButton from "@mui/material/IconButton";
-import Tooltip from "@mui/material/Tooltip";
-import withStyles from '@mui/styles/withStyles';
+import Grid from "@material-ui/core/Grid";
+import IconButton from "@material-ui/core/IconButton";
+import Tooltip from "@material-ui/core/Tooltip";
+import { withStyles } from "@material-ui/core/styles";

 import { faCode } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@ -160,7 +160,7 @@ class Home extends Component {
                  zIndex: 21,
                }}
                onClick={() => this.onChange()}
-                size="large">
+              >
                <FontAwesomeIcon icon={faCode} size="xs" />
              </IconButton>
            </Tooltip>
--- a/src/components/Impressum.js
+++ b/src/components/Impressum.js
@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import { withRouter } from "react-router-dom";
-import Container from "@mui/material/Container";
+import Container from "@material-ui/core/Container";
 class Impressum extends Component {
  render() {
    return (
--- a/src/components/MaxBlocks.js
+++ b/src/components/MaxBlocks.js
@ -5,8 +5,8 @@ import { workspaceChange } from '../actions/workspaceActions';

 import * as Blockly from 'blockly/core';

-import TextField from '@mui/material/TextField';
-import Button from '@mui/material/Button';
+import TextField from '@material-ui/core/TextField';
+import Button from '@material-ui/core/Button';

 class MaxBlocks extends Component {

@ -28,12 +28,12 @@ class MaxBlocks extends Component {
    return (
      <div style={{display: 'inline', marginLeft: '10px'}}>
        <TextField
-          variant="standard"
          style={{width: '50px', marginRight: '5px'}}
          name="max"
          type="number"
          onChange={this.onChange}
-          value={this.state.max} />
+          value={this.state.max}
+        />
        <Button style={{marginRight: '10px', color: 'white'}} variant="contained" color="primary" onClick={this.setMaxBlocks}>
          Maximale Blöcke
        </Button>
--- a/src/components/Navbar.js
+++ b/src/components/Navbar.js
@ -8,20 +8,20 @@ import senseboxLogo from "./sensebox_logo.svg";

 import { withRouter } from "react-router-dom";

-import withStyles from '@mui/styles/withStyles';
-import Drawer from "@mui/material/Drawer";
-import AppBar from "@mui/material/AppBar";
-import Toolbar from "@mui/material/Toolbar";
-import List from "@mui/material/List";
-import Typography from "@mui/material/Typography";
-import Divider from "@mui/material/Divider";
-import IconButton from "@mui/material/IconButton";
-import ListItem from "@mui/material/ListItem";
-import ListItemIcon from "@mui/material/ListItemIcon";
-import ListItemText from "@mui/material/ListItemText";
-import LinearProgress from "@mui/material/LinearProgress";
+import { withStyles } from "@material-ui/core/styles";
+import Drawer from "@material-ui/core/Drawer";
+import AppBar from "@material-ui/core/AppBar";
+import Toolbar from "@material-ui/core/Toolbar";
+import List from "@material-ui/core/List";
+import Typography from "@material-ui/core/Typography";
+import Divider from "@material-ui/core/Divider";
+import IconButton from "@material-ui/core/IconButton";
+import ListItem from "@material-ui/core/ListItem";
+import ListItemIcon from "@material-ui/core/ListItemIcon";
+import ListItemText from "@material-ui/core/ListItemText";
+import LinearProgress from "@material-ui/core/LinearProgress";
 import Tour from "reactour";
-import { Badge } from "@mui/material";
+import { Badge } from "@material-ui/core";
 import { home, assessment } from "./Tour";
 import {
  faBars,
@ -37,20 +37,11 @@ import {
  faLightbulb,
  faCode,
  faPuzzlePiece,
-  faUser,
-  faMicrochip,
-  faEarthEurope,
-  faEarthAmericas,
-  faCaretDown
 } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import * as Blockly from "blockly";
-import Tooltip from "@mui/material/Tooltip";
-import MenuItem from '@mui/material/MenuItem'
-import Menu from '@mui/material/Menu'
-import { setLanguage } from "../actions/generalActions";
-import { setBoard } from "../actions/boardAction";
-import { Button } from "@mui/material";
+import Tooltip from "@material-ui/core/Tooltip";
+import NavbarSettings from "./NavbarSettings";

 const styles = (theme) => ({
  drawerWidth: {
@ -70,14 +61,9 @@ const styles = (theme) => ({
 class Navbar extends Component {
  constructor(props) {
    super(props);
-    this.langRef = React.createRef();
-    this.mcuRef = React.createRef();
    this.state = {
      open: false,
      isTourOpen: false,
-      anchorElLang: null,
-      anchorElBoard: null,
-      anchorElUser: null
    };
  }

@ -95,6 +81,7 @@ class Navbar extends Component {

  render() {
    var isHome = /^\/(\/.*$|$)/g.test(this.props.location.pathname);
+    var isTutorial = /^\/tutorial(\/.*$|$)/g.test(this.props.location.pathname);
    var isAssessment =
      /^\/tutorial\/.{1,}$/g.test(this.props.location.pathname) &&
      !this.props.tutorialIsLoading &&
@ -130,7 +117,7 @@ class Navbar extends Component {
              onClick={this.toggleDrawer}
              style={{ margin: "0 10px" }}
              className="MenuButton"
-              size="large">
+            >
              <FontAwesomeIcon icon={faBars} />
            </IconButton>
            <Link to={"/"} style={{ textDecoration: "none", color: "inherit" }}>
@ -141,150 +128,45 @@ class Navbar extends Component {
            <Link to={"/"} style={{ marginLeft: "10px" }}>
              <img src={senseboxLogo} alt="senseBox-Logo" width="30" />
            </Link>
-            <div style={{ margin: "0 0 0 auto", display: "flex", alignItems: 'center', justifyContent: 'center' }}>
+            <NavbarSettings />
+            {isTutorial ? (
+              <Link
+                to={"/tutorial"}
+                style={{
+                  textDecoration: "none",
+                  color: "inherit",
+                  marginLeft: "10px",
+                }}
+              >
+                <Typography variant="h6" noWrap>
+                  Tutorial
+                </Typography>
+              </Link>
+            ) : null}
            {isHome ? (
-                <div style={{ display: "flex" }}>
-                  <div style={{ padding: "12px" }}>
-                    <Button
-                      style={{ textTransform: 'none', cursor: "pointer", alignItems: "center", alignContent: "center", background: "transparent", color: "inherit", fontWeight: "bold", border: "2px solid white", borderRadius: "25px" }}
-                      ref={this.mcuRef}
-                      onClick={() => {
-                        this.setState({ anchorElBoard: this.mcuRef.current })
-                      }}
-                      startIcon={<FontAwesomeIcon icon={faMicrochip} />}
-                      endIcon={<FontAwesomeIcon icon={faCaretDown} />}
-                      sx={{ display: { xs: "none", sm: "none", md: "flex" } }}
-                    >
-                      {this.props.selectedBoard}
-                    </Button>
-                    <Menu
-                      anchorEl={this.state.anchorElBoard}
-                      anchorOrigin={{
-                        vertical: 'bottom',
-                        horizontal: 'center',
-                      }}
-                      keepMounted
-                      transformOrigin={{
-                        vertical: 'top',
-                        horizontal: 'center',
-                      }}
-                      open={Boolean(this.state.anchorElBoard)}
-                      onClose={() => {
-                        this.setState({ anchorElBoard: null });
-                      }}
-                    >
-                      <MenuItem
-                        value="mcu"
-                        onClick={(event) => {
-                          this.props.setBoard(event.currentTarget.getAttribute("value"));
-                          this.setState({ anchorElBoard: null });
-                        }}
-                      >
-                        mcu
-                      </MenuItem>
-                      <MenuItem
-                        value="mini"
-                        onClick={(event) => {
-                          this.props.setBoard(event.currentTarget.getAttribute("value"));
-                          this.setState({ anchorElBoard: null });
-                        }}
-                      >
-                        mini
-                      </MenuItem>
-                    </Menu>
-                  </div>
-                  <div style={{ padding: "12px" }}>
-                    {
-                      this.props.language === "en_US" ?
-                        (
-                          <Button
-                            style={{ textTransform: 'none', cursor: "pointer", alignItems: "center", alignContent: "center", background: "transparent", color: "inherit", fontWeight: "bold", border: "2px solid white", borderRadius: "25px" }}
-                            ref={this.langRef}
-                            onClick={() => {
-                              this.setState({ anchorElLang: this.langRef.current })
-                            }}
-                            startIcon={<FontAwesomeIcon icon={faEarthAmericas} />}
-                            endIcon={<FontAwesomeIcon icon={faCaretDown} />}
-                            sx={{ display: { xs: "none", sm: "none", md: "flex" } }}
-                          >
-                            English
-                          </Button>
-                        ) : (
-                          <Button
-                            style={{ textTransform: 'none', cursor: "pointer", alignItems: "center", alignContent: "center", background: "transparent", color: "inherit", fontWeight: "bold", border: "2px solid white", borderRadius: "25px" }}
-                            ref={this.langRef}
-                            onClick={() => {
-                              this.setState({ anchorElLang: this.langRef.current })
-                            }}
-                            startIcon={<FontAwesomeIcon icon={faEarthEurope} />}
-                            endIcon={<FontAwesomeIcon icon={faCaretDown} />}
-                            sx={{ display: { xs: "none", sm: "none", md: "flex" } }}
-                          >
-                            Deutsch
-                          </Button>
-
-                        )
-                    }
-                    <Menu
-                      anchorEl={this.state.anchorElLang}
-                      anchorOrigin={{
-                        vertical: 'bottom',
-                        horizontal: 'center',
-                      }}
-                      keepMounted
-                      transformOrigin={{
-                        vertical: 'top',
-                        horizontal: 'center',
-                      }}
-                      open={Boolean(this.state.anchorElLang)}
-                      onClose={() => {
-                        this.setState({ anchorElLang: null });
-                      }}
-                    >
-                      <MenuItem
-                        value="de_DE"
-                        onClick={(event) => {
-                          this.props.setLanguage(event.currentTarget.getAttribute("value"));
-                          this.setState({ anchorElLang: null });
-                        }}
-                      >
-                        Deutsch
-                      </MenuItem>
-                      <MenuItem
-                        value="en_US"
-                        onClick={(event) => {
-                          this.props.setLanguage(event.currentTarget.getAttribute("value"));
-                          this.setState({ anchorElLang: null });
-                        }}
-                      >
-                        English
-                      </MenuItem>
-                    </Menu>
-                  </div>
-                </div>
-              ) : (null)}
-              {isHome ? (
-                <Tooltip title={'Start Tour'} arrow>
+              <Tooltip title={Blockly.Msg.tooltip_start_tour} arrow>
                <IconButton
                  color="inherit"
                  className={`openTour ${this.props.classes.button}`}
                  onClick={() => {
                    this.openTour();
                  }}
-                    size="large">
+                  style={{ margin: "0 30px 0 0" }}
+                >
                  <FontAwesomeIcon icon={faQuestionCircle} />
                </IconButton>
              </Tooltip>
            ) : null}
            {isAssessment ? (
-                <Tooltip title={'Start tour'} arrow>
+              <Tooltip title={Blockly.Msg.tooltip_start_tour} arrow>
                <IconButton
                  color="inherit"
                  className={`openTour ${this.props.classes.button}`}
                  onClick={() => {
                    this.openTour();
                  }}
-                    size="large">
+                  style={{ margin: "0 30px 0 0" }}
+                >
                  <FontAwesomeIcon icon={faQuestionCircle} />
                </IconButton>
              </Tooltip>
@ -296,71 +178,6 @@ class Navbar extends Component {
                this.closeTour();
              }}
            />
-              {this.props.user ? (
-                <div>
-                  <IconButton
-                    color="inherit"
-                    onClick={(event) => { this.setState({ anchorElUser: event.target }) }}
-                    style={{ margin: "0 30px 0 0" }}
-                    size="large"
-                  >
-                    <FontAwesomeIcon icon={faUser} />
-                  </IconButton>
-                  <Menu
-                    anchorEl={this.state.anchorElUser}
-                    anchorOrigin={{
-                      vertical: 'bottom',
-                      horizontal: 'center',
-                    }}
-                    keepMounted
-                    transformOrigin={{
-                      vertical: 'top',
-                      horizontal: 'center',
-                    }}
-                    open={Boolean(this.state.anchorElUser)}
-                    onClose={() => { this.setState({ anchorElUser: null }); }}
-                  >
-                    <div className="" style={{ paddingLeft: "16px", paddingRight: "16px", paddingTop: "16px" }}>
-                      <p style={{ fontWeight: "bold", margin: "0px" }}>
-                        {this.props.user.name}
-                      </p>
-                      <p style={{ marginTop: "0px", color: "#696969" }}>
-                        {this.props.user.email}
-                      </p>
-                    </div>
-                    <hr style={{ borderTop: "3px solid #bbb", marginLeft: "5px", marginRight: "5px" }} />
-                    <MenuItem>
-                      <Link to={"/user"} style={{ textDecoration: 'none', color: "black" }}>
-                        {Blockly.Msg.navbar_account}
-                      </Link>
-                    </MenuItem>
-                    <MenuItem>
-                      <Link to={"/settings"} style={{ textDecoration: 'none', color: "black" }}>
-                        {Blockly.Msg.navbar_settings}
-                      </Link>
-                    </MenuItem>
-                    <MenuItem
-                      onClick={() => {
-                        this.props.logout()
-                      }}
-                    >
-                      {Blockly.Msg.navbar_logout}
-                    </MenuItem>
-                  </Menu>
-                </div>
-              )
-                :
-                (<Link to={"/user/login"} style={{ textDecoration: 'none', color: "white" }}>
-                  <IconButton
-                    color="inherit"
-                    style={{ margin: "0 30px 0 auto" }}
-                  >
-                    <FontAwesomeIcon icon={faUser} />
-                  </IconButton>
-                </Link>
-                )
-              }
-            </div>
          </Toolbar>
        </AppBar>
        <Drawer
@ -452,7 +269,7 @@ class Navbar extends Component {
                        <FontAwesomeIcon icon={item.icon} />
                      </ListItemIcon>
                      {item.text === "Code Editor" ? (
-                        <Badge badgeContent={"Experimental"} color="primary" overlap="rectangular">
+                        <Badge badgeContent={"Experimental"} color="primary">
                          <ListItemText primary={item.text} />
                        </Badge>
                      ) : (
@ -554,10 +371,6 @@ Navbar.propTypes = {
  user: PropTypes.object,
  tutorial: PropTypes.object,
  activeStep: PropTypes.number.isRequired,
-  setLanguage: PropTypes.func.isRequired,
-  language: PropTypes.string.isRequired,
-  setBoard: PropTypes.func.isRequired,
-  selectedBoard: PropTypes.string.isRequired
 };

 const mapStateToProps = (state) => ({
@ -567,10 +380,8 @@ const mapStateToProps = (state) => ({
  user: state.auth.user,
  tutorial: state.tutorial.tutorials[0],
  activeStep: state.tutorial.activeStep,
-  language: state.general.language,
-  selectedBoard: state.board.board
 });

-export default connect(mapStateToProps, { logout, setLanguage, setBoard })(
+export default connect(mapStateToProps, { logout })(
  withStyles(styles, { withTheme: true })(withRouter(Navbar))
 );
--- a/src/components/NavbarSettings.js
+++ b/src/components/NavbarSettings.js
@ -0,0 +1,88 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { setLanguage } from '../actions/generalActions';
+import MenuItem from '@material-ui/core/MenuItem';
+import Select from '@material-ui/core/Select';
+import { setBoard } from '../actions/boardAction';
+import ReactCountryFlag from "react-country-flag";
+import { MuiThemeProvider, createTheme } from '@material-ui/core/styles';
+
+const theme = createTheme({
+    overrides: {
+        MuiSelect: {
+            select: {
+                '&:focus': {
+                    backgroundColor: 'transparent',
+                },
+            },
+        },
+    },
+});
+
+class NavbarSettings extends Component {
+    componentDidMount() {
+        // Ensure that Blockly.setLocale is adopted in the component.
+        // Otherwise, the text will not be displayed until the next update of the component.
+        this.forceUpdate();
+    }
+
+    handleChange = (event) => {
+        this.props.setLanguage(event.target.value);
+    }
+
+
+    render() {
+        return (
+            <div style={{ margin: "0 0 0 auto", display: "flex" }}>
+                <div style={{ margin: "0 30px 0 auto", display: "flex" }}>
+                    <MuiThemeProvider theme={theme}>
+                        <Select
+                            value={this.props.selectedBoard}
+                            onChange={(e) => this.props.setBoard(e.target.value)}
+                            disableUnderline={true}
+                            style={{ backgroundColor: "transparent !important" }}
+                            // IconComponent={() => <div />}
+                        >
+                            <MenuItem value="mcu">senseBox MCU</MenuItem>
+                            <MenuItem value="mini">senseBox MCU mini</MenuItem>
+                        </Select>
+                    </MuiThemeProvider>
+                </div>
+                <div style={{ margin: "0 0 0 auto", display: "flex" }}>
+                    <MuiThemeProvider theme={theme}>
+                        <Select
+                            value={this.props.language}
+                            onChange={this.handleChange}
+                            disableUnderline={true}
+                            IconComponent={() => null}
+                        >
+                            <MenuItem value={'en_US'} >
+                                <ReactCountryFlag
+                                    countryCode="US"
+                                    svg
+                                    cdnSuffix="svg"
+                                    title="US"
+                                />
+                            </MenuItem>
+                            <MenuItem value={'de_DE'}>
+                                <ReactCountryFlag
+                                    countryCode="DE"
+                                    svg
+                                    cdnSuffix="svg"
+                                    title="DE"
+                                />
+                            </MenuItem>
+                        </Select>
+                    </MuiThemeProvider>
+                </div>
+            </div >
+        );
+    }
+}
+
+const mapStateToProps = state => ({
+    language: state.general.language,
+    selectedBoard: state.board.board
+});
+
+export default connect(mapStateToProps, { setLanguage, setBoard })(NavbarSettings);
--- a/src/components/News.js
+++ b/src/components/News.js
@ -4,11 +4,11 @@ import Breadcrumbs from './Breadcrumbs';

 import { withRouter } from 'react-router-dom';

-import Button from '@mui/material/Button';
-import Typography from '@mui/material/Typography';
+import Button from '@material-ui/core/Button';
+import Typography from '@material-ui/core/Typography';
 import * as Blockly from 'blockly'
 import ReactMarkdown from 'react-markdown';
-import Container from '@mui/material/Container';
+import Container from '@material-ui/core/Container';

 const news = `

--- a/src/components/NotFound.js
+++ b/src/components/NotFound.js
@ -4,8 +4,8 @@ import Breadcrumbs from './Breadcrumbs';

 import { withRouter } from 'react-router-dom';

-import Button from '@mui/material/Button';
-import Typography from '@mui/material/Typography';
+import Button from '@material-ui/core/Button';
+import Typography from '@material-ui/core/Typography';
 import * as Blockly from 'blockly'

 class NotFound extends Component {
--- a/src/components/Privacy.js
+++ b/src/components/Privacy.js
@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { withRouter } from 'react-router-dom';
-import Container from '@mui/material/Container';
+import Container from '@material-ui/core/Container';
 class Privay extends Component {
    render() {
        return (
--- a/src/components/Project/Project.js
+++ b/src/components/Project/Project.js
@ -10,8 +10,8 @@ import { withRouter } from 'react-router-dom';
 import Home from '../Home';
 import Breadcrumbs from '../Breadcrumbs';

-import Backdrop from '@mui/material/Backdrop';
-import CircularProgress from '@mui/material/CircularProgress';
+import Backdrop from '@material-ui/core/Backdrop';
+import CircularProgress from '@material-ui/core/CircularProgress';


 class Project extends Component {
--- a/src/components/Project/ProjectHome.js
+++ b/src/components/Project/ProjectHome.js
@ -11,13 +11,13 @@ import BlocklyWindow from "../Blockly/BlocklyWindow";
 import Snackbar from "../Snackbar";
 import WorkspaceFunc from "../Workspace/WorkspaceFunc";

-import withStyles from '@mui/styles/withStyles';
-import Grid from "@mui/material/Grid";
-import Paper from "@mui/material/Paper";
-import Divider from "@mui/material/Divider";
-import Typography from "@mui/material/Typography";
-import Backdrop from "@mui/material/Backdrop";
-import CircularProgress from "@mui/material/CircularProgress";
+import { withStyles } from "@material-ui/core/styles";
+import Grid from "@material-ui/core/Grid";
+import Paper from "@material-ui/core/Paper";
+import Divider from "@material-ui/core/Divider";
+import Typography from "@material-ui/core/Typography";
+import Backdrop from "@material-ui/core/Backdrop";
+import CircularProgress from "@material-ui/core/CircularProgress";
 import DeviceSelection from "../DeviceSelection";

 const styles = (theme) => ({
--- a/src/components/Route/Routes.js
+++ b/src/components/Route/Routes.js
@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { visitPage, setPlatform } from "../../actions/generalActions";
+import { visitPage } from "../../actions/generalActions";

 import { Route, Switch, withRouter } from "react-router-dom";

@ -27,24 +27,6 @@ import Faq from "../Faq";
 import CodeEditor from "../CodeEditor/CodeEditor";

 class Routes extends Component {
-
-  componentDidMount() {
-    const { location } = this.props;
-    const query = new URLSearchParams(location.search, [location.search]);
-    const mode = query.get('mode');
-
-    if (!this.props.platform && mode) {
-      switch (mode.toLowerCase()) {
-        case 'tablet':
-          this.props.setPlatform(true);
-          break;
-        default:
-          break;
-      }
-
-    }
-  }
-
  componentDidUpdate() {
    this.props.visitPage();
  }
@ -123,12 +105,6 @@ class Routes extends Component {

 Home.propTypes = {
  visitPage: PropTypes.func,
-  platform: PropTypes.bool.isRequired,
-  setPlatform: PropTypes.func.isRequired
 };

-const mapStateToProps = (state) => ({
-  platform: state.general.platform,
-});
-
-export default connect(mapStateToProps, { visitPage, setPlatform })(withRouter(Routes));
+export default connect(null, { visitPage })(withRouter(Routes));
--- a/src/components/SensorInfo.js
+++ b/src/components/SensorInfo.js
@ -1,9 +1,9 @@
 import React from "react";
-import Box from "@mui/material/Box";
-import Tab from "@mui/material/Tab";
-import TabContext from "@mui/lab/TabContext";
-import TabList from "@mui/lab/TabList";
-import TabPanel from "@mui/lab/TabPanel";
+import Box from "@material-ui/core/Box";
+import Tab from "@material-ui/core/Tab";
+import TabContext from "@material-ui/lab/TabContext";
+import TabList from "@material-ui/lab/TabList";
+import TabPanel from "@material-ui/lab/TabPanel";
 import store from "../store";
 import ReactMarkdown from "react-markdown";
 import * as Blockly from "blockly";
--- a/src/components/Settings/DeviceSelector.js
+++ b/src/components/Settings/DeviceSelector.js
@ -5,12 +5,12 @@ import { setBoard } from '../../actions/boardAction';

 import * as Blockly from 'blockly/core';

-import InputLabel from '@mui/material/InputLabel';
-import MenuItem from '@mui/material/MenuItem';
-import FormControl from '@mui/material/FormControl';
-import Select from '@mui/material/Select';
-import Typography from '@mui/material/Typography';
-import FormHelperText from '@mui/material/FormHelperText';
+import InputLabel from '@material-ui/core/InputLabel';
+import MenuItem from '@material-ui/core/MenuItem';
+import FormControl from '@material-ui/core/FormControl';
+import Select from '@material-ui/core/Select';
+import Typography from '@material-ui/core/Typography';
+import FormHelperText from '@material-ui/core/FormHelperText';

 class DeviceSelector extends Component {

@ -26,14 +26,14 @@ class DeviceSelector extends Component {
      <div>
        <Typography style={{fontWeight: 'bold'}}>{Blockly.Msg.settings_board}</Typography>
        <FormHelperText style={{color: 'black', lineHeight: 1.3, marginBottom: '8px'}}>{Blockly.Msg.settings_board_text}</FormHelperText>
-        <FormControl variant="standard">
+        <FormControl>
          <InputLabel id="demo-simple-select-label">{Blockly.Msg.settings_board}</InputLabel>
          <Select
-            variant="standard"
            labelId="demo-simple-select-label"
            id="demo-simple-select"
            value={this.props.selectedBoard}
-            onChange={(e) => this.props.setBoard(e.target.value)}>
+            onChange={(e) => this.props.setBoard(e.target.value)}
+          >
            <MenuItem value="mcu">senseBox MCU</MenuItem>
            <MenuItem value="mini">senseBox MCU mini</MenuItem>
          </Select>
--- a/src/components/Settings/LanguageSelector.js
+++ b/src/components/Settings/LanguageSelector.js
@ -5,12 +5,12 @@ import { setLanguage } from '../../actions/generalActions';

 import * as Blockly from 'blockly/core';

-import InputLabel from '@mui/material/InputLabel';
-import MenuItem from '@mui/material/MenuItem';
-import FormControl from '@mui/material/FormControl';
-import Select from '@mui/material/Select';
-import Typography from '@mui/material/Typography';
-import FormHelperText from '@mui/material/FormHelperText';
+import InputLabel from '@material-ui/core/InputLabel';
+import MenuItem from '@material-ui/core/MenuItem';
+import FormControl from '@material-ui/core/FormControl';
+import Select from '@material-ui/core/Select';
+import Typography from '@material-ui/core/Typography';
+import FormHelperText from '@material-ui/core/FormHelperText';

 class LanguageSelector extends Component {

@ -29,14 +29,14 @@ class LanguageSelector extends Component {
      <div>
        <Typography style={{fontWeight: 'bold'}}>{Blockly.Msg.settings_language}</Typography>
        <FormHelperText style={{color: 'black', lineHeight: 1.3, marginBottom: '8px'}}>{Blockly.Msg.settings_language_text}</FormHelperText>
-        <FormControl variant="standard">
+        <FormControl>
          <InputLabel id="demo-simple-select-label">{Blockly.Msg.settings_language}</InputLabel>
          <Select
-            variant="standard"
            labelId="demo-simple-select-label"
            id="demo-simple-select"
            value={this.props.language}
-            onChange={this.handleChange}>
+            onChange={this.handleChange}
+          >
            <MenuItem value={'de_DE'}>{Blockly.Msg.settings_language_de}</MenuItem>
            <MenuItem value={'en_US'}>{Blockly.Msg.settings_language_en}</MenuItem>
          </Select>
--- a/src/components/Settings/OtaSelector.js
+++ b/src/components/Settings/OtaSelector.js
@ -5,12 +5,12 @@ import { setPlatform } from "../../actions/generalActions";

 import * as Blockly from "blockly/core";

-import InputLabel from "@mui/material/InputLabel";
-import MenuItem from "@mui/material/MenuItem";
-import FormControl from "@mui/material/FormControl";
-import Select from "@mui/material/Select";
-import Typography from "@mui/material/Typography";
-import FormHelperText from "@mui/material/FormHelperText";
+import InputLabel from "@material-ui/core/InputLabel";
+import MenuItem from "@material-ui/core/MenuItem";
+import FormControl from "@material-ui/core/FormControl";
+import Select from "@material-ui/core/Select";
+import Typography from "@material-ui/core/Typography";
+import FormHelperText from "@material-ui/core/FormHelperText";

 class OtaSelector extends Component {
  componentDidMount() {
@ -33,16 +33,16 @@ class OtaSelector extends Component {
            https://sensebox.de/app
          </a>
        </FormHelperText>
-        <FormControl variant="standard">
+        <FormControl>
          <InputLabel id="demo-simple-select-label">
            {Blockly.Msg.settings_statistics}
          </InputLabel>
          <Select
-            variant="standard"
            labelId="demo-simple-select-label"
            id="demo-simple-select"
            value={this.props.platform}
-            onChange={(e) => this.props.setPlatform(e.target.value)}>
+            onChange={(e) => this.props.setPlatform(e.target.value)}
+          >
            <MenuItem value={true}>{Blockly.Msg.settings_ota_on}</MenuItem>
            <MenuItem value={false}>{Blockly.Msg.settings_ota_off}</MenuItem>
          </Select>
--- a/src/components/Settings/RenderSelector.js
+++ b/src/components/Settings/RenderSelector.js
@ -5,12 +5,12 @@ import { setRenderer } from '../../actions/generalActions';

 import * as Blockly from 'blockly/core'

-import InputLabel from '@mui/material/InputLabel';
-import MenuItem from '@mui/material/MenuItem';
-import FormControl from '@mui/material/FormControl';
-import Select from '@mui/material/Select';
-import Typography from '@mui/material/Typography';
-import FormHelperText from '@mui/material/FormHelperText';
+import InputLabel from '@material-ui/core/InputLabel';
+import MenuItem from '@material-ui/core/MenuItem';
+import FormControl from '@material-ui/core/FormControl';
+import Select from '@material-ui/core/Select';
+import Typography from '@material-ui/core/Typography';
+import FormHelperText from '@material-ui/core/FormHelperText';


 class RenderSelector extends Component {
@ -26,14 +26,14 @@ class RenderSelector extends Component {
      <div>
        <Typography style={{fontWeight: 'bold'}}>{Blockly.Msg.settings_renderer}</Typography>
        <FormHelperText style={{color: 'black', lineHeight: 1.3, marginBottom: '8px'}}>{Blockly.Msg.settings_renderer_text}</FormHelperText>
-        <FormControl variant="standard">
+        <FormControl>
          <InputLabel id="demo-simple-select-label">{Blockly.Msg.settings_renderer}</InputLabel>
          <Select
-            variant="standard"
            labelId="demo-simple-select-label"
            id="demo-simple-select"
            value={this.props.renderer}
-            onChange={(e) => this.props.setRenderer(e.target.value)}>
+            onChange={(e) => this.props.setRenderer(e.target.value)}
+          >
            <MenuItem value={'geras'}>Geras</MenuItem>
            <MenuItem value={'zelos'}>Zelos</MenuItem>
          </Select>
--- a/src/components/Settings/Settings.js
+++ b/src/components/Settings/Settings.js
@ -14,8 +14,8 @@ import OtaSelector from "./OtaSelector";
 import SoundsSelector from "./SoundsSelector";
 import DeviceSelector from "./DeviceSelector";

-import Button from "@mui/material/Button";
-import Paper from "@mui/material/Paper";
+import Button from "@material-ui/core/Button";
+import Paper from "@material-ui/core/Paper";

 class Settings extends Component {
  componentDidMount() {
--- a/src/components/Settings/SoundsSelector.js
+++ b/src/components/Settings/SoundsSelector.js
@ -5,12 +5,12 @@ import { setSounds } from "../../actions/generalActions";

 import * as Blockly from "blockly/core";

-import InputLabel from "@mui/material/InputLabel";
-import MenuItem from "@mui/material/MenuItem";
-import FormControl from "@mui/material/FormControl";
-import Select from "@mui/material/Select";
-import Typography from "@mui/material/Typography";
-import FormHelperText from "@mui/material/FormHelperText";
+import InputLabel from "@material-ui/core/InputLabel";
+import MenuItem from "@material-ui/core/MenuItem";
+import FormControl from "@material-ui/core/FormControl";
+import Select from "@material-ui/core/Select";
+import Typography from "@material-ui/core/Typography";
+import FormHelperText from "@material-ui/core/FormHelperText";

 class SoundsSelector extends Component {
  componentDidMount() {
@ -30,16 +30,16 @@ class SoundsSelector extends Component {
        >
          {Blockly.Msg.settings_sounds_text}
        </FormHelperText>
-        <FormControl variant="standard">
+        <FormControl>
          <InputLabel id="demo-simple-select-label">
            {Blockly.Msg.settings_sounds}
          </InputLabel>
          <Select
-            variant="standard"
            labelId="demo-simple-select-label"
            id="demo-simple-select"
            value={this.props.sounds}
-            onChange={(e) => this.props.setSounds(e.target.value)}>
+            onChange={(e) => this.props.setSounds(e.target.value)}
+          >
            <MenuItem value={false}>{Blockly.Msg.settings_ota_off}</MenuItem>
            <MenuItem value={true}>{Blockly.Msg.settings_ota_on}</MenuItem>
          </Select>
--- a/src/components/Settings/StatsSelector.js
+++ b/src/components/Settings/StatsSelector.js
@ -5,12 +5,12 @@ import { setStatistics } from '../../actions/generalActions';

 import * as Blockly from 'blockly/core'

-import InputLabel from '@mui/material/InputLabel';
-import MenuItem from '@mui/material/MenuItem';
-import FormControl from '@mui/material/FormControl';
-import Select from '@mui/material/Select';
-import Typography from '@mui/material/Typography';
-import FormHelperText from '@mui/material/FormHelperText';
+import InputLabel from '@material-ui/core/InputLabel';
+import MenuItem from '@material-ui/core/MenuItem';
+import FormControl from '@material-ui/core/FormControl';
+import Select from '@material-ui/core/Select';
+import Typography from '@material-ui/core/Typography';
+import FormHelperText from '@material-ui/core/FormHelperText';

 class StatsSelector extends Component {

@ -25,14 +25,14 @@ class StatsSelector extends Component {
      <div>
        <Typography style={{fontWeight: 'bold'}}>{Blockly.Msg.settings_statistics}</Typography>
        <FormHelperText style={{color: 'black', lineHeight: 1.3, marginBottom: '8px'}}>{Blockly.Msg.settings_statistics_text}</FormHelperText>
-        <FormControl variant="standard">
+        <FormControl>
          <InputLabel id="demo-simple-select-label">{Blockly.Msg.settings_statistics}</InputLabel>
          <Select
-            variant="standard"
            labelId="demo-simple-select-label"
            id="demo-simple-select"
            value={this.props.statistics}
-            onChange={(e) => this.props.setStatistics(e.target.value)}>
+            onChange={(e) => this.props.setStatistics(e.target.value)}
+          >
            <MenuItem value={true}>{Blockly.Msg.settings_statistics_on}</MenuItem>
            <MenuItem value={false}>{Blockly.Msg.settings_statistics_off}</MenuItem>
          </Select>
--- a/src/components/Snackbar.js
+++ b/src/components/Snackbar.js
@ -1,9 +1,9 @@
 import React, { Component } from 'react';

-import withStyles from '@mui/styles/withStyles';
-import IconButton from '@mui/material/IconButton';
-import MaterialUISnackbar from '@mui/material/Snackbar';
-import SnackbarContent from '@mui/material/SnackbarContent';
+import { withStyles } from '@material-ui/core/styles';
+import IconButton from '@material-ui/core/IconButton';
+import MaterialUISnackbar from '@material-ui/core/Snackbar';
+import SnackbarContent from '@material-ui/core/SnackbarContent';

 import { faTimes } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@ -69,7 +69,7 @@ class Snackbar extends Component {
          style={{flexWrap: 'nowrap'}}
          className={this.props.type === 'error' ? this.props.classes.error : this.props.classes.success}
          action={
-            <IconButton onClick={this.onClose} style={{color: 'inherit'}} size="large">
+            <IconButton onClick={this.onClose} style={{color: 'inherit'}}>
              <FontAwesomeIcon icon={faTimes} size="xs"/>
            </IconButton>
          }
--- a/src/components/TooltipViewer.js
+++ b/src/components/TooltipViewer.js
@ -1,21 +1,19 @@
 import React, { Component } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
-import { Button, Card } from "@mui/material";
+import withWidth from "@material-ui/core/withWidth";
+import { Button, Card } from "@material-ui/core";
 import * as Blockly from "blockly";
-import CardContent from "@mui/material/CardContent";
-import Typography from "@mui/material/Typography";
+import CardContent from "@material-ui/core/CardContent";
+import Typography from "@material-ui/core/Typography";
 import ReactMarkdown from "react-markdown";
-import Dialog from "@mui/material/Dialog";
-import DialogActions from "@mui/material/DialogActions";
-import DialogContent from "@mui/material/DialogContent";
-import Slide from "@mui/material/Slide";
+import Dialog from "@material-ui/core/Dialog";
+import DialogActions from "@material-ui/core/DialogActions";
+import DialogContent from "@material-ui/core/DialogContent";
+import Slide from "@material-ui/core/Slide";
 import SensorInfo from "./SensorInfo";
 import store from "../store";

-// FIXME checkout https://mui.com/components/use-media-query/#migrating-from-withwidth
-const withWidth = () => (WrappedComponent) => (props) => <WrappedComponent {...props} width="xs" />;
-
 const Transition = React.forwardRef(function Transition(props, ref) {
  return <Slide direction="up" ref={ref} {...props} />;
 });
@ -55,7 +53,7 @@ class TooltipViewer extends Component {
            {Blockly.Msg.tooltip_viewer}
          </Typography>

-          <Typography variant="body2" component="span">
+          <Typography variant="body2" component="p">
            <ReactMarkdown linkTarget="_blank">
              {this.props.tooltip}
            </ReactMarkdown>
--- a/src/components/Tutorial/Assessment.js
+++ b/src/components/Tutorial/Assessment.js
@ -6,26 +6,22 @@ import { workspaceName } from "../../actions/workspaceActions";
 import BlocklyWindow from "../Blockly/BlocklyWindow";
 import WorkspaceFunc from "../Workspace/WorkspaceFunc";

-import Grid from "@mui/material/Grid";
-import Card from "@mui/material/Card";
-import Typography from "@mui/material/Typography";
+import withWidth, { isWidthDown } from "@material-ui/core/withWidth";
+import Grid from "@material-ui/core/Grid";
+import Card from "@material-ui/core/Card";
+import Typography from "@material-ui/core/Typography";
 import * as Blockly from "blockly";
 import { initialXml } from "../Blockly/initialXml";
-import IconButton from "@mui/material/IconButton";
+import IconButton from "@material-ui/core/IconButton";
 import CodeViewer from "../CodeViewer";
 import TooltipViewer from "../TooltipViewer";
-import Tooltip from "@mui/material/Tooltip";
+import Tooltip from "@material-ui/core/Tooltip";
 import ReactMarkdown from "react-markdown";
 import { faCode } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import withStyles from '@mui/styles/withStyles';
+import { withStyles } from "@material-ui/core/styles";
 import remarkGfm from "remark-gfm";
 import remarkGemoji from "remark-gemoji";
-import { isWidthDown } from "../../helpers/handleBreakpoints";
-
-
-// FIXME checkout https://mui.com/components/use-media-query/#migrating-from-withwidth
-const withWidth = () => (WrappedComponent) => (props) => <WrappedComponent {...props} width="xs" />;

 const styles = (theme) => ({
  codeOn: {
@ -102,7 +98,8 @@ class Assessment extends Component {
              }
            >
              <IconButton
-                className={`showCode ${this.state.codeOn
+                className={`showCode ${
+                  this.state.codeOn
                    ? this.props.classes.codeOn
                    : this.props.classes.codeOff
                }`}
@ -115,7 +112,7 @@ class Assessment extends Component {
                  zIndex: 21,
                }}
                onClick={() => this.onChange()}
-                size="large">
+              >
                <FontAwesomeIcon icon={faCode} size="xs" />
              </IconButton>
            </Tooltip>
--- a/src/components/Tutorial/Builder/BlocklyExample.js
+++ b/src/components/Tutorial/Builder/BlocklyExample.js
@ -15,13 +15,13 @@ import * as Blockly from "blockly/core";
 import { initialXml } from "../../Blockly//initialXml.js";
 import BlocklyWindow from "../../Blockly/BlocklyWindow";

-import withStyles from '@mui/styles/withStyles';
-import Switch from "@mui/material/Switch";
-import FormControlLabel from "@mui/material/FormControlLabel";
-import FormHelperText from "@mui/material/FormHelperText";
-import FormLabel from "@mui/material/FormLabel";
-import Button from "@mui/material/Button";
-import Grid from "@mui/material/Grid";
+import { withStyles } from "@material-ui/core/styles";
+import Switch from "@material-ui/core/Switch";
+import FormControlLabel from "@material-ui/core/FormControlLabel";
+import FormHelperText from "@material-ui/core/FormHelperText";
+import FormLabel from "@material-ui/core/FormLabel";
+import Button from "@material-ui/core/Button";
+import Grid from "@material-ui/core/Grid";

 const styles = (theme) => ({
  errorColor: {
@ -139,6 +139,7 @@ class BlocklyExample extends Component {
              <Switch
                checked={this.state.checked}
                onChange={(e) => this.onChange(e.target.checked)}
+                color="primary"
              />
            }
          />
--- a/src/components/Tutorial/Builder/Builder.js
+++ b/src/components/Tutorial/Builder/Builder.js
@ -33,19 +33,19 @@ import Snackbar from "../../Snackbar";
 import Public from "./Public";
 import Review from "./Review";

-import withStyles from '@mui/styles/withStyles';
-import Button from "@mui/material/Button";
-import Backdrop from "@mui/material/Backdrop";
-import CircularProgress from "@mui/material/CircularProgress";
-import Divider from "@mui/material/Divider";
-import FormHelperText from "@mui/material/FormHelperText";
-import Radio from "@mui/material/Radio";
-import RadioGroup from "@mui/material/RadioGroup";
-import FormControlLabel from "@mui/material/FormControlLabel";
-import InputLabel from "@mui/material/InputLabel";
-import MenuItem from "@mui/material/MenuItem";
-import FormControl from "@mui/material/FormControl";
-import Select from "@mui/material/Select";
+import { withStyles } from "@material-ui/core/styles";
+import Button from "@material-ui/core/Button";
+import Backdrop from "@material-ui/core/Backdrop";
+import CircularProgress from "@material-ui/core/CircularProgress";
+import Divider from "@material-ui/core/Divider";
+import FormHelperText from "@material-ui/core/FormHelperText";
+import Radio from "@material-ui/core/Radio";
+import RadioGroup from "@material-ui/core/RadioGroup";
+import FormControlLabel from "@material-ui/core/FormControlLabel";
+import InputLabel from "@material-ui/core/InputLabel";
+import MenuItem from "@material-ui/core/MenuItem";
+import FormControl from "@material-ui/core/FormControl";
+import Select from "@material-ui/core/Select";
 import * as Blockly from "blockly";

 const styles = (theme) => ({
@ -407,7 +407,7 @@ class Builder extends Component {
          <FormControlLabel
            style={{ color: "black" }}
            value="new"
-            control={<Radio />}
+            control={<Radio color="primary" />}
            label={Blockly.Msg.builder_createNew}
            labelPlacement="end"
          />
@ -417,7 +417,7 @@ class Builder extends Component {
                style={{ color: "black" }}
                disabled={this.props.index === 0}
                value="change"
-                control={<Radio />}
+                control={<Radio color="primary" />}
                label={Blockly.Msg.builder_changeExisting}
                labelPlacement="end"
              />
@ -425,7 +425,7 @@ class Builder extends Component {
                style={{ color: "black" }}
                disabled={this.props.index === 0}
                value="delete"
-                control={<Radio />}
+                control={<Radio color="primary" />}
                label={Blockly.Msg.builder_deleteExisting}
                labelPlacement="end"
              />
@ -470,12 +470,12 @@ class Builder extends Component {
          <FormControl variant="outlined" style={{ width: "100%" }}>
            <InputLabel id="select-outlined-label">Tutorial</InputLabel>
            <Select
-              variant="standard"
              color="primary"
              labelId="select-outlined-label"
              value={this.props.id}
              onChange={(e) => this.onChangeId(e.target.value)}
-              label="Tutorial">
+              label="Tutorial"
+            >
              {filteredTutorials.map((tutorial) => (
                <MenuItem value={tutorial._id}>
                  {tutorial.title}{" "}
--- a/src/components/Tutorial/Builder/Difficulty.js
+++ b/src/components/Tutorial/Builder/Difficulty.js
@ -9,13 +9,13 @@ import {
  deleteError,
 } from "../../../actions/tutorialBuilderActions";

-import withStyles from '@mui/styles/withStyles';
+import { withStyles } from "@material-ui/core/styles";
 import ReactStars from "react-rating-stars-component";
 import * as Blockly from "blockly";
-import FormGroup from "@mui/material/FormGroup";
-import FormControlLabel from "@mui/material/FormControlLabel";
-import FormControl from "@mui/material/FormControl";
-import FormLabel from "@mui/material/FormLabel";
+import FormGroup from "@material-ui/core/FormGroup";
+import FormControlLabel from "@material-ui/core/FormControlLabel";
+import FormControl from "@material-ui/core/FormControl";
+import FormLabel from "@material-ui/core/FormLabel";

 const styles = (theme) => ({
  multiline: {
@ -55,7 +55,7 @@ class Difficulty extends Component {

  render() {
    return (
-      <FormControl variant="standard" component="fieldset">
+      <FormControl component="fieldset">
        <FormLabel component="legend">
          {Blockly.Msg.builder_difficulty}
        </FormLabel>
--- a/src/components/Tutorial/Builder/Hardware.js
+++ b/src/components/Tutorial/Builder/Hardware.js
@ -9,17 +9,14 @@ import {

 import hardware from "../../../data/hardware.json";

-import withStyles from '@mui/styles/withStyles';
-import ImageList from "@mui/material/ImageList";
-import ImageListItem from "@mui/material/ImageListItem";
-import ImageListItemBar from "@mui/material/ImageListItemBar";
-import FormHelperText from "@mui/material/FormHelperText";
-import FormLabel from "@mui/material/FormLabel";
+import { withStyles } from "@material-ui/core/styles";
+import withWidth, { isWidthDown } from "@material-ui/core/withWidth";
+import ImageList from "@material-ui/core/ImageList";
+import ImageListItem from "@material-ui/core/ImageListItem";
+import ImageListItemBar from "@material-ui/core/ImageListItemBar";
+import FormHelperText from "@material-ui/core/FormHelperText";
+import FormLabel from "@material-ui/core/FormLabel";
 import * as Blockly from "blockly";
-import { isWidthDown } from "../../../helpers/handleBreakpoints";
-
-// FIXME checkout https://mui.com/components/use-media-query/#migrating-from-withwidth
-const withWidth = () => (WrappedComponent) => (props) => <WrappedComponent {...props} width="xs" />;

 const styles = (theme) => ({
  multiImageListItem: {
--- a/src/components/Tutorial/Builder/Id.js
+++ b/src/components/Tutorial/Builder/Id.js
@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { tutorialId, setError, deleteError } from '../../../actions/tutorialBuilderActions';

-import withStyles from '@mui/styles/withStyles';
-import Button from '@mui/material/Button';
-import OutlinedInput from '@mui/material/OutlinedInput';
-import InputLabel from '@mui/material/InputLabel';
-import FormControl from '@mui/material/FormControl';
-import FormHelperText from '@mui/material/FormHelperText';
+import { withStyles } from '@material-ui/core/styles';
+import Button from '@material-ui/core/Button';
+import OutlinedInput from '@material-ui/core/OutlinedInput';
+import InputLabel from '@material-ui/core/InputLabel';
+import FormControl from '@material-ui/core/FormControl';
+import FormHelperText from '@material-ui/core/FormHelperText';

 import { faPlus, faMinus } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
--- a/src/components/Tutorial/Builder/MarkdownEditor.js
+++ b/src/components/Tutorial/Builder/MarkdownEditor.js
@ -8,7 +8,7 @@ import {
  deleteError,
 } from "../../../actions/tutorialBuilderActions";

-import FormControl from "@mui/material/FormControl";
+import FormControl from "@material-ui/core/FormControl";
 import MarkdownIt from "markdown-it";
 import Editor from "react-markdown-editor-lite";
 import "react-markdown-editor-lite/lib/index.css";
--- a/src/components/Tutorial/Builder/Media.js
+++ b/src/components/Tutorial/Builder/Media.js
@ -5,13 +5,13 @@ import { changeContent, deleteProperty, setError, deleteError } from '../../../a

 import Textfield from './Textfield';

-import withStyles from '@mui/styles/withStyles';
-import Switch from '@mui/material/Switch';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import FormHelperText from '@mui/material/FormHelperText';
-import Radio from '@mui/material/Radio';
-import RadioGroup from '@mui/material/RadioGroup';
-import Button from '@mui/material/Button';
+import { withStyles } from '@material-ui/core/styles';
+import Switch from '@material-ui/core/Switch';
+import FormControlLabel from '@material-ui/core/FormControlLabel';
+import FormHelperText from '@material-ui/core/FormHelperText';
+import Radio from '@material-ui/core/Radio';
+import RadioGroup from '@material-ui/core/RadioGroup';
+import Button from '@material-ui/core/Button';

 const styles = (theme) => ({
  errorColor: {
@ -97,6 +97,7 @@ class Media extends Component {
            <Switch
              checked={this.state.checked}
              onChange={(e) => this.onChangeSwitch(e.target.checked)}
+              color="primary"
            />
          }
        />
@ -105,13 +106,13 @@ class Media extends Component {
            <RadioGroup row value={this.state.radioValue} onChange={(e) => {this.onChangeRadio(e.target.value);}}>
              <FormControlLabel style={{color: 'black'}}
                value="picture"
-                control={<Radio />}
+                control={<Radio color="primary" />}
                label="Bild"
                labelPlacement="end"
              />
              <FormControlLabel style={{color: 'black'}}
                value="youtube"
-                control={<Radio />}
+                control={<Radio color="primary" />}
                label="Youtube-Video"
                labelPlacement="end"
              />
--- a/src/components/Tutorial/Builder/Public.js
+++ b/src/components/Tutorial/Builder/Public.js
@ -9,14 +9,14 @@ import {
  deleteError,
 } from "../../../actions/tutorialBuilderActions";

-import withStyles from '@mui/styles/withStyles';
+import { withStyles } from "@material-ui/core/styles";

 import * as Blockly from "blockly";
-import Checkbox from "@mui/material/Checkbox";
-import FormGroup from "@mui/material/FormGroup";
-import FormControlLabel from "@mui/material/FormControlLabel";
-import FormControl from "@mui/material/FormControl";
-import FormLabel from "@mui/material/FormLabel";
+import Checkbox from "@material-ui/core/Checkbox";
+import FormGroup from "@material-ui/core/FormGroup";
+import FormControlLabel from "@material-ui/core/FormControlLabel";
+import FormControl from "@material-ui/core/FormControl";
+import FormLabel from "@material-ui/core/FormLabel";

 const styles = (theme) => ({
  multiline: {
@ -52,7 +52,7 @@ class Public extends Component {

  render() {
    return (
-      <FormControl variant="standard" component="fieldset">
+      <FormControl component="fieldset">
        <FormLabel component="legend">
          {Blockly.Msg.builder_public_head}
        </FormLabel>
@ -63,6 +63,7 @@ class Public extends Component {
              <Checkbox
                checked={this.props.value}
                onChange={this.handleChange}
+                color="primary"
                name="checkedA"
                inputProps={{ "aria-label": "secondary checkbox" }}
              />
--- a/src/components/Tutorial/Builder/Requirements.js
+++ b/src/components/Tutorial/Builder/Requirements.js
@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { changeContent } from '../../../actions/tutorialBuilderActions';

-import FormGroup from '@mui/material/FormGroup';
-import Checkbox from '@mui/material/Checkbox';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import FormLabel from '@mui/material/FormLabel';
-import FormHelperText from '@mui/material/FormHelperText';
-import FormControl from '@mui/material/FormControl';
+import FormGroup from '@material-ui/core/FormGroup';
+import Checkbox from '@material-ui/core/Checkbox';
+import FormControlLabel from '@material-ui/core/FormControlLabel';
+import FormLabel from '@material-ui/core/FormLabel';
+import FormHelperText from '@material-ui/core/FormHelperText';
+import FormControl from '@material-ui/core/FormControl';
 import * as Blockly from 'blockly'
 class Requirements extends Component {

@ -26,13 +26,11 @@ class Requirements extends Component {

  render() {
    return (
-      <FormControl
-        variant="standard"
-        style={{ marginBottom: '10px', padding: '18.5px 14px', borderRadius: '25px', border: '1px solid lightgrey', width: 'calc(100% - 28px)' }}>
+      <FormControl style={{ marginBottom: '10px', padding: '18.5px 14px', borderRadius: '25px', border: '1px solid lightgrey', width: 'calc(100% - 28px)' }}>
        <FormLabel style={{ color: 'black' }}>{Blockly.Msg.builder_requirements_head}</FormLabel>
        <FormHelperText style={{ marginTop: '5px' }}>{Blockly.Msg.builder_requirements_order}</FormHelperText>
        <FormGroup>
-          {this.props.tutorials.filter(tutorial => tutorial._id !== this.props.id && tutorial.public).map((tutorial, i) =>
+          {this.props.tutorials.filter(tutorial => tutorial._id !== this.props.id).map((tutorial, i) =>
            <FormControlLabel
              key={i}
              control={
@ -41,6 +39,7 @@ class Requirements extends Component {
                  checked={this.props.value.filter(id => id === tutorial._id).length > 0}
                  onChange={(e) => this.onChange(e)}
                  name="requirements"
+                  color="primary"
                />
              }
              label={tutorial.title}
--- a/src/components/Tutorial/Builder/Review.js
+++ b/src/components/Tutorial/Builder/Review.js
@ -9,14 +9,14 @@ import {
  deleteError,
 } from "../../../actions/tutorialBuilderActions";

-import withStyles from '@mui/styles/withStyles';
+import { withStyles } from "@material-ui/core/styles";

 import * as Blockly from "blockly";
-import Checkbox from "@mui/material/Checkbox";
-import FormGroup from "@mui/material/FormGroup";
-import FormControlLabel from "@mui/material/FormControlLabel";
-import FormControl from "@mui/material/FormControl";
-import FormLabel from "@mui/material/FormLabel";
+import Checkbox from "@material-ui/core/Checkbox";
+import FormGroup from "@material-ui/core/FormGroup";
+import FormControlLabel from "@material-ui/core/FormControlLabel";
+import FormControl from "@material-ui/core/FormControl";
+import FormLabel from "@material-ui/core/FormLabel";

 const styles = (theme) => ({
  multiline: {
@ -52,7 +52,7 @@ class Review extends Component {

  render() {
    return (
-      <FormControl variant="standard" component="fieldset">
+      <FormControl component="fieldset">
        <FormLabel component="legend">
          {Blockly.Msg.builder_review_head}
        </FormLabel>
@ -64,6 +64,7 @@ class Review extends Component {
              <Checkbox
                checked={this.props.value}
                onChange={this.handleChange}
+                color="primary"
                name="checkedA"
                inputProps={{ "aria-label": "secondary checkbox" }}
              />
--- a/src/components/Tutorial/Builder/Step.js
+++ b/src/components/Tutorial/Builder/Step.js
@ -15,10 +15,10 @@ import BlocklyExample from "./BlocklyExample";
 import Requirements from "./Requirements";
 import Hardware from "./Hardware";

-import withStyles from '@mui/styles/withStyles';
-import Typography from "@mui/material/Typography";
-import IconButton from "@mui/material/IconButton";
-import Tooltip from "@mui/material/Tooltip";
+import { withStyles } from "@material-ui/core/styles";
+import Typography from "@material-ui/core/Typography";
+import IconButton from "@material-ui/core/IconButton";
+import Tooltip from "@material-ui/core/Tooltip";

 import {
  faPlus,
@ -85,7 +85,7 @@ class Step extends Component {
                className={this.props.classes.button}
                style={index === 0 ? {} : { marginBottom: "5px" }}
                onClick={() => this.props.addStep(index + 1)}
-                size="large">
+              >
                <FontAwesomeIcon icon={faPlus} size="xs" />
              </IconButton>
            </Tooltip>
@ -100,7 +100,7 @@ class Step extends Component {
                    className={this.props.classes.button}
                    style={{ marginBottom: "5px" }}
                    onClick={() => this.props.changeStepIndex(index, index - 1)}
-                    size="large">
+                  >
                    <FontAwesomeIcon icon={faAngleDoubleUp} size="xs" />
                  </IconButton>
                </Tooltip>
@ -113,7 +113,7 @@ class Step extends Component {
                    className={this.props.classes.button}
                    style={{ marginBottom: "5px" }}
                    onClick={() => this.props.changeStepIndex(index, index + 1)}
-                    size="large">
+                  >
                    <FontAwesomeIcon icon={faAngleDoubleDown} size="xs" />
                  </IconButton>
                </Tooltip>
@ -125,7 +125,7 @@ class Step extends Component {
                      this.props.classes.delete
                    )}
                    onClick={() => this.props.removeStep(index)}
-                    size="large">
+                  >
                    <FontAwesomeIcon icon={faTrash} size="xs" />
                  </IconButton>
                </Tooltip>
--- a/src/components/Tutorial/Builder/StepType.js
+++ b/src/components/Tutorial/Builder/StepType.js
@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { changeContent, deleteProperty, deleteError } from '../../../actions/tutorialBuilderActions';

-import Radio from '@mui/material/Radio';
-import RadioGroup from '@mui/material/RadioGroup';
-import FormControlLabel from '@mui/material/FormControlLabel';
+import Radio from '@material-ui/core/Radio';
+import RadioGroup from '@material-ui/core/RadioGroup';
+import FormControlLabel from '@material-ui/core/FormControlLabel';

 class StepType extends Component {

@ -23,14 +23,14 @@ class StepType extends Component {
      <RadioGroup row value={this.props.value === 'task' ? 'task' : 'instruction'} onChange={(e) => this.onChange(e.target.value)}>
        <FormControlLabel style={{color: 'black'}}
          value="instruction"
-          control={<Radio />}
+          control={<Radio color="primary" />}
          label="Anleitung"
          labelPlacement="end"
        />
        <FormControlLabel style={{color: 'black'}}
          disabled={this.props.index === 0}
          value="task"
-          control={<Radio />}
+          control={<Radio color="primary" />}
          label="Aufgabe"
          labelPlacement="end"
        />
--- a/src/components/Tutorial/Builder/Textfield.js
+++ b/src/components/Tutorial/Builder/Textfield.js
@ -9,11 +9,11 @@ import {
  deleteError,
 } from "../../../actions/tutorialBuilderActions";

-import withStyles from '@mui/styles/withStyles';
-import OutlinedInput from "@mui/material/OutlinedInput";
-import InputLabel from "@mui/material/InputLabel";
-import FormControl from "@mui/material/FormControl";
-import FormHelperText from "@mui/material/FormHelperText";
+import { withStyles } from "@material-ui/core/styles";
+import OutlinedInput from "@material-ui/core/OutlinedInput";
+import InputLabel from "@material-ui/core/InputLabel";
+import FormControl from "@material-ui/core/FormControl";
+import FormHelperText from "@material-ui/core/FormHelperText";

 const styles = (theme) => ({
  multiline: {
--- a/src/components/Tutorial/Hardware.js
+++ b/src/components/Tutorial/Hardware.js
@ -4,22 +4,18 @@ import Dialog from "../Dialog";

 import hardware from "../../data/hardware.json";

-import withStyles from '@mui/styles/withStyles';
-import Link from "@mui/material/Link";
-import Typography from "@mui/material/Typography";
-import IconButton from "@mui/material/IconButton";
-import ImageList from "@mui/material/ImageList";
-import ImageListItem from "@mui/material/ImageListItem";
-import ImageListItemBar from "@mui/material/ImageListItemBar";
+import { withStyles } from "@material-ui/core/styles";
+import withWidth, { isWidthDown } from "@material-ui/core/withWidth";
+import Link from "@material-ui/core/Link";
+import Typography from "@material-ui/core/Typography";
+import IconButton from "@material-ui/core/IconButton";
+import ImageList from "@material-ui/core/ImageList";
+import ImageListItem from "@material-ui/core/ImageListItem";
+import ImageListItemBar from "@material-ui/core/ImageListItemBar";

 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faExpandAlt } from "@fortawesome/free-solid-svg-icons";
 import * as Blockly from "blockly";
-import { isWidthDown } from "../../helpers/handleBreakpoints";
-
-// FIXME checkout https://mui.com/components/use-media-query/#migrating-from-withwidth
-const withWidth = () => (WrappedComponent) => (props) => <WrappedComponent {...props} width="xs" />;
-
 const styles = (theme) => ({
  expand: {
    "&:hover": {
@ -55,9 +51,9 @@ class Hardware extends Component {
  };

  render() {
-    var cols = isWidthDown("md", window.innerWidth)
-      ? isWidthDown("sm", window.innerWidth)
-        ? isWidthDown("xs", window.innerWidth)
+    var cols = isWidthDown("md", this.props.width)
+      ? isWidthDown("sm", this.props.width)
+        ? isWidthDown("xs", this.props.width)
          ? 2
          : 3
        : 4
@ -97,7 +93,7 @@ class Hardware extends Component {
                      className={this.props.classes.expand}
                      aria-label="Vollbild"
                      onClick={() => this.handleClickOpen(hardwareInfo)}
-                      size="large">
+                    >
                      <FontAwesomeIcon icon={faExpandAlt} size="xs" />
                    </IconButton>
                  }
@ -128,7 +124,7 @@ class Hardware extends Component {
              target="_blank"
              href={this.state.hardwareInfo.url}
              color="primary"
-              underline="hover">
+            >
              {Blockly.Msg.tutorials_hardware_here}
            </Link>
            .
--- a/src/components/Tutorial/HintTutorialExists.js
+++ b/src/components/Tutorial/HintTutorialExists.js
@ -3,9 +3,9 @@ import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import Dialog from "../Dialog";

-import withStyles from '@mui/styles/withStyles';
-import Checkbox from "@mui/material/Checkbox";
-import FormControlLabel from "@mui/material/FormControlLabel";
+import { withStyles } from "@material-ui/core/styles";
+import Checkbox from "@material-ui/core/Checkbox";
+import FormControlLabel from "@material-ui/core/FormControlLabel";
 import * as Blockly from "blockly";
 import ReactMarkdown from "react-markdown";

@ -78,6 +78,7 @@ class HintTutorialExists extends Component {
              checked={this.state.checked}
              onChange={(e) => this.onChange(e)}
              name="dialog"
+              color="primary"
            />
          }
          label={Blockly.Msg.labels_donotshowagain}
--- a/src/components/Tutorial/Instruction.js
+++ b/src/components/Tutorial/Instruction.js
@ -4,8 +4,8 @@ import Hardware from "./Hardware";
 import Requirement from "./Requirement";
 import BlocklyWindow from "../Blockly/BlocklyWindow";

-import Grid from "@mui/material/Grid";
-import Typography from "@mui/material/Typography";
+import Grid from "@material-ui/core/Grid";
+import Typography from "@material-ui/core/Typography";
 import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
 import remarkGemoji from "remark-gemoji";
--- a/src/components/Tutorial/Requirement.js
+++ b/src/components/Tutorial/Requirement.js
@ -4,11 +4,11 @@ import { connect } from "react-redux";

 import clsx from "clsx";
 import { withRouter, Link } from "react-router-dom";
-import { alpha } from "@mui/material/styles";
-import withStyles from '@mui/styles/withStyles';
-import Typography from "@mui/material/Typography";
-import List from "@mui/material/List";
-import Tooltip from "@mui/material/Tooltip";
+import { alpha } from "@material-ui/core/styles";
+import { withStyles } from "@material-ui/core/styles";
+import Typography from "@material-ui/core/Typography";
+import List from "@material-ui/core/List";
+import Tooltip from "@material-ui/core/Tooltip";

 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faCheck, faTimes } from "@fortawesome/free-solid-svg-icons";
@ -166,7 +166,6 @@ class Requirement extends Component {
                            icon={
                              tutorialStatus === "Success" ? faCheck : faTimes
                            }
-                            
                          />
                        ) : (
                          <Typography
--- a/src/components/Tutorial/SolutionCheck.js
+++ b/src/components/Tutorial/SolutionCheck.js
@ -10,10 +10,10 @@ import Dialog from "../Dialog";

 import { checkXml } from "../../helpers/compareXml";

-import withStyles from '@mui/styles/withStyles';
-import IconButton from "@mui/material/IconButton";
-import Tooltip from "@mui/material/Tooltip";
-import Button from "@mui/material/Button";
+import { withStyles } from "@material-ui/core/styles";
+import IconButton from "@material-ui/core/IconButton";
+import Tooltip from "@material-ui/core/Tooltip";
+import Button from "@material-ui/core/Button";

 import { faClipboardCheck } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@ -62,7 +62,7 @@ class SolutionCheck extends Component {
            className={`solutionCheck ${this.props.classes.compile}`}
            style={{ width: "40px", height: "40px", marginRight: "5px" }}
            onClick={() => this.check()}
-            size="large">
+          >
            <FontAwesomeIcon icon={faClipboardCheck} size="xs" />
          </IconButton>
        </Tooltip>
--- a/src/components/Tutorial/StepperHorizontal.js
+++ b/src/components/Tutorial/StepperHorizontal.js
@ -7,12 +7,12 @@ import { withRouter } from "react-router-dom";
 import clsx from "clsx";

 // import tutorials from '../../data/tutorials';
-import { alpha } from "@mui/material/styles";
+import { alpha } from "@material-ui/core/styles";

-import withStyles from '@mui/styles/withStyles';
-import Typography from "@mui/material/Typography";
-import Tooltip from "@mui/material/Tooltip";
-import Button from "@mui/material/Button";
+import { withStyles } from "@material-ui/core/styles";
+import Typography from "@material-ui/core/Typography";
+import Tooltip from "@material-ui/core/Tooltip";
+import Button from "@material-ui/core/Button";

 import { faCheck, faTimes } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@ -127,7 +127,6 @@ class StepperHorizontal extends Component {
                  <FontAwesomeIcon
                    className={this.props.classes.icon}
                    icon={tutorialStatus === "Success" ? faCheck : faTimes}
-                    
                  />
                </div>
              ) : null}
--- a/src/components/Tutorial/StepperVertical.js
+++ b/src/components/Tutorial/StepperVertical.js
@ -6,12 +6,12 @@ import { tutorialStep } from "../../actions/tutorialActions";
 import { withRouter } from "react-router-dom";

 import clsx from "clsx";
-import { alpha } from "@mui/material/styles";
-import withStyles from '@mui/styles/withStyles';
-import Stepper from "@mui/material/Stepper";
-import Step from "@mui/material/Step";
-import StepLabel from "@mui/material/StepLabel";
-import Tooltip from "@mui/material/Tooltip";
+import { alpha } from "@material-ui/core/styles";
+import { withStyles } from "@material-ui/core/styles";
+import Stepper from "@material-ui/core/Stepper";
+import Step from "@material-ui/core/Step";
+import StepLabel from "@material-ui/core/StepLabel";
+import Tooltip from "@material-ui/core/Tooltip";

 const styles = (theme) => ({
  verticalStepper: {
@ -23,12 +23,13 @@ const styles = (theme) => ({
    // borderWidth: '2px',
    borderRadius: "50%",
    borderColor: theme.palette.secondary.main,
-    width: "1rem",
+    width: "12px",
+    height: "12px",
    margin: "0 auto",
  },
  stepIconLarge: {
-    width: "2rem",
-    height: "1rem",
+    width: "24px",
+    height: "24px",
  },
  stepIconLargeSuccess: {
    borderColor: theme.palette.primary.main,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
fbruc03	cb04ec6e43	remove log	2022-12-05 13:59:19 +01:00
fbruc03	42a8d3db4f	remove background on focus	2022-11-25 11:53:04 +01:00
fbruc03	3959de86f4	fix translations in complie screen (tablet mode)	2022-11-17 18:12:32 +01:00
fbruc03	360169c8c9	add language and mcu settings to navbar	2022-11-17 17:42:40 +01:00