diff --git a/apps/Notepad ++/credits b/apps/Notepad ++/credits
new file mode 100644
index 0000000..b8c1437
--- /dev/null
+++ b/apps/Notepad ++/credits	
@@ -0,0 +1 @@
+App added to pi-apps by RPICoder
diff --git a/apps/Notepad ++/description b/apps/Notepad ++/description
new file mode 100644
index 0000000..fc17d67
--- /dev/null
+++ b/apps/Notepad ++/description	
@@ -0,0 +1,4 @@
+Notepad++ is a free source code editor and Notepad replacement that supports several languages. 
+To Run:  Menu -> Accessories -> Notepad++
+
+This app runs with the help of box86 and wine.
diff --git a/apps/Notepad ++/icon-24.png b/apps/Notepad ++/icon-24.png
new file mode 100644
index 0000000..d2313a5
Binary files /dev/null and b/apps/Notepad ++/icon-24.png differ
diff --git a/apps/Notepad ++/icon-64.png b/apps/Notepad ++/icon-64.png
new file mode 100644
index 0000000..211cb17
Binary files /dev/null and b/apps/Notepad ++/icon-64.png differ
diff --git a/apps/Notepad ++/install-32 b/apps/Notepad ++/install-32
new file mode 100755
index 0000000..132243a
--- /dev/null
+++ b/apps/Notepad ++/install-32	
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+DIRECTORY="$(dirname "$(dirname "$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )")")"
+
+function error {
+  echo -e "\\e[91m$1\\e[39m"
+  exit 1
+}
+
+#Checking if wine is installed
+if ! command -v wine &>/dev/null ; then
+  echo 'Wine Is Not Installed'
+  #Installing wine
+  $DIRECTORY/manage install 'Wine (x86)' || error 'Failed to install wine'
+fi
+
+
+#Removing any files which were created by corrupted installation
+rm -rf npp.zip ~/Notepad++
+
+#Downloading npp files
+wget https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v7.9.4/npp.7.9.4.portable.zip -O npp.zip || error 'Failed to download npp files'
+#Extracting npp files
+unzip npp.zip -d ~/Notepad++ || error 'Failed to extract npp archive'
+#Removing npp archive
+rm npp.zip 
+
+#Creating Desktop Entry
+echo "[Desktop Entry]
+Name=Notepad++
+Comment=Notepad++ is a free source code editor and Notepad replacement that supports several languages.
+Exec=wine '$HOME/Notepad++/notepad++.exe'
+Icon=$(dirname "$0")/icon-64.png
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=Utility;" > ~/.local/share/applications/notepad++.desktop || error "Failed to create menu button!"
+
+
diff --git a/apps/Notepad ++/uninstall b/apps/Notepad ++/uninstall
new file mode 100755
index 0000000..69bda26
--- /dev/null
+++ b/apps/Notepad ++/uninstall	
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+DIRECTORY="$(dirname "$(dirname "$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )")")"
+
+function error {
+  echo -e "\\e[91m$1\\e[39m"
+  exit 1
+}
+
+#if your app installs any packages, keep this command here so those packages will be removed.
+"${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1
+
+#Removing Downlaoded Files
+rm -rf ~/Notepad++
+rm -f ~/.local/share/applications/notepad++.desktop
diff --git a/apps/Notepad ++/website b/apps/Notepad ++/website
new file mode 100644
index 0000000..66a403c
--- /dev/null
+++ b/apps/Notepad ++/website	
@@ -0,0 +1 @@
+https://notepad-plus-plus.org/
diff --git a/data/categories/structure b/data/categories/structure
index fec903b..97afdb3 100644
--- a/data/categories/structure
+++ b/data/categories/structure
@@ -24,11 +24,14 @@ Doom 3|Games
 Eagle CAD|Editors
 eDEX-UI|Eyecandy
 Email Checker|Internet
+FreeCAD|Editors
 FreeTube|Internet
 Geany Dark Mode|Eyecandy
+Godot Engine 3.2.4|Games
 Intellij IDEA|Editors
 Interactive Brokers TW|Tools
 jGRASP IDE|Editors
+KeePassX|
 LibrePCB|Editors
 Lightpad|Eyecandy
 Lokinet|Internet
@@ -39,6 +42,7 @@ Minecraft Java|Games
 Minecraft Pi (Modded)|Games
 Mission Planner|Tools
 Node.js|Internet
+Notepad ++|Editors
 OBS Studio|Tools
 Pi-Apps Terminal Plugin|Tools
 PiGro|Tools
@@ -77,11 +81,10 @@ VeraCrypt|Tools
 Visual Studio Code|Editors
 Vivaldi|Internet
 VSCodium|Editors
-WACUP (new WinAmp)|Windows apps
+WACUP (new WinAmp)|Tools
 Whatsapp|Internet
 Windows 10 Theme|Eyecandy
 Wine (x86)|Tools
 WPS Office|Editors
 YouTubuddy|Internet
 Zoom|Internet
-FreeCAD|Editors