diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@
                 I18n
                 XmlGui
                 ConfigWidgets
+                TextEditor
             )
 
 find_package(Qt5 REQUIRED COMPONENTS
diff --git a/src/mainwindow.h b/src/mainwindow.h
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -18,11 +18,13 @@
 #pragma once
 
 #include <QMainWindow>
+#include <QUrl>
 #include <KAtCore/AtCore>
 #include <KXmlGui/KXmlGuiWindow>
 #include <dialogs/connectsettingsdialog.h>
 #include <dialogs/generalsettingsdialog.h>
 
+
 namespace Ui
 {
 class MainWindow;
@@ -40,7 +42,7 @@
     Ui::MainWindow *ui;
     AtCore core;
     QStringList firmwaresList;
-    QString fileName;
+    QUrl fileName;
     void initConnectsToAtCore();
     void initLocalVariables();
     void initWidgets();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -93,12 +93,6 @@
         ui->gcodeEditorWidget->setVisible(!ui->gcodeEditorWidget->isVisible());
     });
 
-    action = actionCollection()->addAction(QStringLiteral("edit_gcode"));
-    action->setText(i18n("&Edit GCode"));
-    connect(action, &QAction::triggered, this, [ = ] {
-        ui->gcodeEditorWidget->setVisible(!ui->gcodeEditorWidget->isVisible());
-    });
-
     QAction *quit = KStandardAction::quit(qApp, SLOT(quit()), actionCollection());
 
     setupGUI(Default, "atelierui.rc");
@@ -109,7 +103,7 @@
     QUrl fileNameFromDialog = QFileDialog::getOpenFileUrl(this, i18n("Open GCode"),
                               QDir::homePath(), i18n("GCode (*.gco *.gcode)"));
     if (!fileNameFromDialog.isEmpty()) {
-        fileName = fileNameFromDialog.toLocalFile();
+        fileName = fileNameFromDialog;
         ui->gcodeEditorWidget->loadFile(fileName);
     }
 }
@@ -127,7 +121,8 @@
 void MainWindow::printFile()
 {
     if (!fileName.isEmpty() && (core.state() == PrinterState::IDLE)) {
-        core.print(fileName);
+        QString f = fileName.toLocalFile();
+        core.print(f);
     }
 }
 
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>102</width>
-    <height>132</height>
+    <width>94</width>
+    <height>123</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,7 +21,7 @@
     <item row="0" column="1">
      <widget class="PrinterHotendPositionVisualController" name="printerHostAxisControlWidget"/>
     </item>
-    <item row="0" column="0">
+    <item row="0" column="0" rowspan="2">
      <widget class="GCodeEditorWidget" name="gcodeEditorWidget" native="true"/>
     </item>
    </layout>
@@ -31,8 +31,8 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>102</width>
-     <height>30</height>
+     <width>94</width>
+     <height>19</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -6,4 +6,4 @@
 
 add_library(AtelierWidgets STATIC ${widgets_SRCS})
 
-target_link_libraries(AtelierWidgets Qt5::Core Qt5::Widgets Qt5::SerialPort KF5::Solid KF5::I18n)
+target_link_libraries(AtelierWidgets Qt5::Core Qt5::Widgets Qt5::SerialPort KF5::Solid KF5::I18n KF5::TextEditor)
diff --git a/src/widgets/gcodeeditorwidget.h b/src/widgets/gcodeeditorwidget.h
--- a/src/widgets/gcodeeditorwidget.h
+++ b/src/widgets/gcodeeditorwidget.h
@@ -18,6 +18,9 @@
 #pragma once
 
 #include <QWidget>
+#include <KTextEditor/Document>
+#include <KTextEditor/Editor>
+#include <KTextEditor/View>
 
 namespace Ui
 {
@@ -31,8 +34,12 @@
 public:
     explicit GCodeEditorWidget(QWidget *parent = nullptr);
     ~GCodeEditorWidget();
-    void loadFile(const QString &fileName);
+    void loadFile(const QUrl &fileName);
 
 private:
+    KTextEditor::Editor *editor;
+    KTextEditor::Document *doc;
+    KTextEditor::View *view;
     Ui::GCodeEditorWidget *ui;
+    void setupToolbar();
 };
diff --git a/src/widgets/gcodeeditorwidget.cpp b/src/widgets/gcodeeditorwidget.cpp
--- a/src/widgets/gcodeeditorwidget.cpp
+++ b/src/widgets/gcodeeditorwidget.cpp
@@ -18,46 +18,55 @@
 #include "gcodeeditorwidget.h"
 #include "ui_gcodeeditorwidget.h"
 #include <QTextStream>
+#include <QFile>
+#include <QVBoxLayout>
+#include <QPushButton>
+
 GCodeEditorWidget::GCodeEditorWidget(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::GCodeEditorWidget)
 {
     ui->setupUi(this);
+    setupToolbar();
+    editor = KTextEditor::Editor::instance();
+    doc = editor->createDocument(this);
+    doc->setHighlightingMode(QString("G-Code"));
+    view = doc->createView(ui->containerWidget);
+    QVBoxLayout *layout = new QVBoxLayout();
+    layout->addWidget(view);
+    ui->containerWidget->setLayout(layout);
+
 }
 
 GCodeEditorWidget::~GCodeEditorWidget()
 {
     delete ui;
 }
 
-void GCodeEditorWidget::loadFile(const QString &fileName)
+void GCodeEditorWidget::loadFile(const QUrl &fileName)
+{
+    doc->openUrl(fileName);
+    doc->setHighlightingMode(QString("G-Code"));
+}
+
+void GCodeEditorWidget::setupToolbar()
 {
-    QRegularExpression cacthMov("G(?<command>.) .*\\bX(?<axisX>[0-9.-]+) Y(?<axisY>[0-9.-]+) Z(?<axisZ>[0-9].+)");
-    QRegularExpression catchEnd(";(\\s?)(End)(\\s?\\w+\\s?(\\w+)?)");
-    catchEnd.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
-    QRegularExpressionMatch match;
-    QFile gcode(fileName);
-    if (!gcode.open(QFile::ReadOnly)) {
-        return;
-    }
-    QTextStream gcodeStream(&gcode);
-    QString content = gcodeStream.readAll();
-    //TODO: Send this content to 3DView
-    QStringList list = content.split(QStringLiteral("\n"), QString::SkipEmptyParts);
-    QString header, footer;
-    foreach (const auto &line, list) {
-        match = cacthMov.match(line);
-        if (match.hasMatch()) {
-            break;
+    ui->savePB->setIcon(QIcon::fromTheme("document-save"));
+    connect(ui->savePB, &QPushButton::clicked, [ = ](){
+        if(doc->isModified()) {
+            doc->documentSave();
         }
-        header += (line + QStringLiteral("\n"));
-    }
-    int last = list.lastIndexOf(catchEnd);
-    if (last != -1) {
-        for (int i = last; i <= list.size() - 1; ++i) {
-            footer += (list.at(i) + QStringLiteral("\n"));
+    });
+    ui->saveAsPB->setIcon(QIcon::fromTheme("document-save-as"));
+    connect(ui->saveAsPB, &QPushButton::clicked, [ = ] () {
+        if(doc->isModified()) {
+            doc->documentSaveAs();
         }
-    }
-    ui->headerPT->setPlainText(header);
-    ui->footerPT->setPlainText(footer);
+    });
+    ui->redoPB->setIcon(QIcon::fromTheme("edit-redo"));
+    ui->undoPB->setIcon(QIcon::fromTheme("edit-undo"));
+    ui->cancelPB->setIcon(QIcon::fromTheme("edit-clear"));
+    connect(ui->cancelPB, &QPushButton::clicked,[ = ] () {
+        doc->documentReload();
+    });
 }
diff --git a/src/widgets/gcodeeditorwidget.ui b/src/widgets/gcodeeditorwidget.ui
--- a/src/widgets/gcodeeditorwidget.ui
+++ b/src/widgets/gcodeeditorwidget.ui
@@ -13,24 +13,15 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
     <widget class="QLabel" name="label">
-     <property name="layoutDirection">
-      <enum>Qt::LeftToRight</enum>
-     </property>
      <property name="text">
-      <string>Header</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      <string>GCode Editor</string>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
-    <widget class="QPlainTextEdit" name="headerPT"/>
-   </item>
-   <item row="0" column="0">
+   <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QPushButton" name="savePB">
@@ -40,53 +31,37 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="cancelPB">
+      <widget class="QPushButton" name="saveAsPB">
        <property name="text">
-        <string>Cancel</string>
+        <string>Save As</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="undoPB">
+      <widget class="QPushButton" name="redoPB">
        <property name="text">
-        <string>Undo</string>
+        <string>Redo</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="redoPB">
+      <widget class="QPushButton" name="undoPB">
        <property name="text">
-        <string>Redo</string>
+        <string>Undo</string>
        </property>
       </widget>
      </item>
      <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
+      <widget class="QPushButton" name="cancelPB">
+       <property name="text">
+        <string>Cancel</string>
        </property>
-      </spacer>
+      </widget>
      </item>
     </layout>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_2">
-     <property name="text">
-      <string>Footer</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QPlainTextEdit" name="footerPT"/>
+   <item>
+    <widget class="QWidget" name="containerWidget" native="true"/>
    </item>
   </layout>
  </widget>