diff --git a/Dockerfile b/Dockerfile
index 947a3c7..5f47ab3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ WORKDIR /app
 # will be cached unless changes to one of those two files
 # are made.
 COPY package.json package-lock.json ./
-RUN npm install
+RUN npm install --legacy-peer-deps
 
 # Copy the main application
 COPY ./ /app/
diff --git a/package.json b/package.json
index e7afe8e..35a94e6 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/react-fontawesome": "^0.1.14",
     "@frogcat/ttl2jsonld": "^0.0.6",
+    "@kbss-cvut/s-forms": "^0.7.1",
     "@tippyjs/react": "^4.2.5",
     "@triply/yasgui": "^4.2.14",
     "@webpack-cli/serve": "^2.0.5",
@@ -45,7 +46,6 @@
     "react-router-dom": "^5.1.2",
     "react-spring": "^8.0.27",
     "react-treebeard": "^3.2.4",
-    "s-forms": "https://kbss.felk.cvut.cz/dist/s-forms-0.2.7.tgz",
     "semantic-ui-react": "^0.88.2",
     "superagent": "^6.1.0",
     "toasted-notes": "^3.2.0",
diff --git a/src/components/dagre/Dagre.js b/src/components/dagre/Dagre.js
index 1fe9f49..a933add 100644
--- a/src/components/dagre/Dagre.js
+++ b/src/components/dagre/Dagre.js
@@ -29,7 +29,7 @@ import ScriptOntologyModal from "../modal/ScriptOntologyModal";
 import ScriptExecutionModal from "../modal/ScriptExecutionModal";
 import "@triply/yasgui/build/yasgui.min.css";
 import SFormsFunctionModal from "../sform/SFormsFunctionModal";
-import "s-forms/css/s-forms.min.css"
+import "@kbss-cvut/s-forms/css";
 import { SemipolarLoading } from 'react-loadingg';
 import ErrorModal from "../modal/ErrorModal";
 import toast from "toasted-notes";
diff --git a/src/components/modal/ErrorModal.js b/src/components/modal/ErrorModal.js
index cb74596..f309324 100644
--- a/src/components/modal/ErrorModal.js
+++ b/src/components/modal/ErrorModal.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import SForms from 's-forms';
 
 import {Button, Form, Modal} from "react-bootstrap";
 import {Rest} from "../rest/Rest";
diff --git a/src/components/modal/FunctionExecutionModal.js b/src/components/modal/FunctionExecutionModal.js
index 514d300..fb3a891 100644
--- a/src/components/modal/FunctionExecutionModal.js
+++ b/src/components/modal/FunctionExecutionModal.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import SForms from 's-forms';
 
 import {Button, Form, Modal} from "react-bootstrap";
 import {Rest} from "../rest/Rest";
diff --git a/src/components/modal/MoveModuleModal.js b/src/components/modal/MoveModuleModal.js
index 688b4cc..7b08e8e 100644
--- a/src/components/modal/MoveModuleModal.js
+++ b/src/components/modal/MoveModuleModal.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import SForms from 's-forms';
 
 import {Alert, Button, Col, Container, Form, Modal, Row, Table} from "react-bootstrap";
 import {
diff --git a/src/components/modal/ScriptActionsModuleModal.js b/src/components/modal/ScriptActionsModuleModal.js
index 34fc959..f305319 100644
--- a/src/components/modal/ScriptActionsModuleModal.js
+++ b/src/components/modal/ScriptActionsModuleModal.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import SForms from 's-forms';
 
 import {Alert, Button, Col, Container, Form, Modal, Row, Table} from "react-bootstrap";
 import {
diff --git a/src/components/modal/ScriptOntologyModal.js b/src/components/modal/ScriptOntologyModal.js
index 188ca11..fa0a3f0 100644
--- a/src/components/modal/ScriptOntologyModal.js
+++ b/src/components/modal/ScriptOntologyModal.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import SForms from 's-forms';
 
 import {Alert, Button, Col, Container, Form, Modal, Row, Table} from "react-bootstrap";
 import {
diff --git a/src/components/modal/ValidationReportModal.js b/src/components/modal/ValidationReportModal.js
index c8ad8c5..72c4ed3 100644
--- a/src/components/modal/ValidationReportModal.js
+++ b/src/components/modal/ValidationReportModal.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import SForms from 's-forms';
 
 import {Alert, Button, Col, Container, Form, Modal, Row} from "react-bootstrap";
 import {
diff --git a/src/components/sform/SFormsFunctionModal.js b/src/components/sform/SFormsFunctionModal.js
index 1db1e85..696c91a 100644
--- a/src/components/sform/SFormsFunctionModal.js
+++ b/src/components/sform/SFormsFunctionModal.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import SForms from 's-forms';
+import SForms from '@kbss-cvut/s-forms';
 
 import {Button, Modal} from "react-bootstrap";
 import {Rest} from "../rest/Rest";
diff --git a/src/components/sform/SFormsModal.js b/src/components/sform/SFormsModal.js
index a138758..35136d4 100644
--- a/src/components/sform/SFormsModal.js
+++ b/src/components/sform/SFormsModal.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import SForms from 's-forms';
+import SForms from '@kbss-cvut/s-forms';
 
 import {Button, Modal} from "react-bootstrap";
 import {Rest} from "../rest/Rest";