diff --git a/docker-compose.yml b/docker-compose.yml
index a503ac8a..d20a6d8c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
   frontend:
     #build: ./frontend
-    image: ghcr.io/frikky/shuffle-frontend:0.8.92
+    image: ghcr.io/frikky/shuffle-frontend:0.8.93
     container_name: shuffle-frontend
     hostname: shuffle-frontend
     ports:
@@ -17,7 +17,7 @@ services:
       - backend
   backend:
     #build: ./backend
-    image: ghcr.io/frikky/shuffle-backend:0.8.92
+    image: ghcr.io/frikky/shuffle-backend:0.8.93
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}
     # Here for debugging:
diff --git a/frontend/package.json b/frontend/package.json
index 4bfb693d..6295f47f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,6 +22,7 @@
     "cytoscape-grid-guide": "~2.1.2",
     "cytoscape-node-html-label": "^1.1.5",
     "cytoscape-panzoom": "^2.5.2",
+    "cytoscape-popper": "^2.0.0",
     "cytoscape-undo-redo": "^1.3.2",
     "d3": "~4.10.0",
     "dotenv": "^6.1.0",
diff --git a/frontend/src/views/AngularWorkflow.jsx b/frontend/src/views/AngularWorkflow.jsx
index 276dc752..121ee0f1 100644
--- a/frontend/src/views/AngularWorkflow.jsx
+++ b/frontend/src/views/AngularWorkflow.jsx
@@ -39,7 +39,12 @@ const inputColor = "#383B40"
 cytoscape.use(edgehandles);
 cytoscape.use(clipboard);
 cytoscape.use(undoRedo);
-cytoscape.use( cxtmenu );
+cytoscape.use(cxtmenu);
+
+// Adds specific text to items
+//import popper from 'cytoscape-popper';
+//cytoscape.use(popper);
+
 
 // https://stackoverflow.com/questions/19014250/rerender-view-on-browser-resize-with-react
 function useWindowSize() {
@@ -2462,6 +2467,42 @@ const AngularWorkflow = (props) => {
 			cy.on('drag', 'node', (e) => onNodeDrag(e, selectedAction))
 			cy.on('free', 'node', (e) => onNodeDragStop(e, selectedAction))
 
+			//let popper2 = cy.popper({
+			//  content: () => {
+			//    let div = document.createElement('div');
+			//
+			//    div.innerHTML = 'Popper content'
+			//
+			//    document.body.appendChild(div)
+			//
+			//    return div
+			//  },
+			//  renderedPosition: () => ({ x: 100, y: 200 }),
+			//  popper: {} // my popper options here
+			//});
+
+			//let popper1 = cy.nodes()[0].popper({
+			//  content: () => {
+			//    let div = document.createElement('div')
+			//
+			//    div.innerHTML = 'Popper content'
+			//    document.body.appendChild(div)
+			//
+			//    return div
+			//  },
+			//  popper: {} // my popper options here
+			//})
+			//let update = () => {
+			//  popper.update()
+			//}
+
+			//let node = cy.nodes().first()
+			//node.on('position', update)
+
+
+			
+
+
 			//cy.on('mouseover', 'node', () => $(targetElement).addClass('mouseover'));
 
 			//cy.on('cxttapstart', 'node', (e) => edgeHandler.start(e.target))
@@ -3397,7 +3438,7 @@ const AngularWorkflow = (props) => {
 				}
 
 				if (data.is_valid === false) {
-					alert.error(data.name+" trigger isn't available yet")
+					alert.error(data.name+" requires hybrid version of Shuffle")
 					return
 				}
 
diff --git a/frontend/src/views/AppCreator.jsx b/frontend/src/views/AppCreator.jsx
index 0f0981d0..abd711ef 100644
--- a/frontend/src/views/AppCreator.jsx
+++ b/frontend/src/views/AppCreator.jsx
@@ -198,7 +198,7 @@ const AppCreator = (props) => {
 	const actionNonBodyRequest = ["GET", "HEAD", "DELETE", "CONNECT"]
 	const actionBodyRequest = ["POST", "PUT", "PATCH",]
 	//const authenticationOptions = ["No authentication", "API key", "Bearer auth", "Basic auth", "Oauth2"]
-	const authenticationOptions = ["No authentication", "API key", "Bearer auth", "Basic auth"]
+	const authenticationOptions = ["No authentication", "API key", "Bearer auth", "Basic auth", "JWT"]
 	const apikeySelection = ["Header", "Query",]
 
 	const [name, setName] = useState("");
@@ -1263,7 +1263,12 @@ const AppCreator = (props) => {
 				"scheme": "bearer",
 				"bearerFormat": "UUID",
 			}
-
+		} else if (authenticationOption === "JWT") {
+			data.components.securitySchemes["BearerAuth"] = {
+				"type": "http",
+				"scheme": "bearer",
+				"bearerFormat": "JWT",
+			}
 		} else if (authenticationOption === "Basic auth") {
 			data.components.securitySchemes["BasicAuth"] = {
 				"type": "http",