diff --git a/.gitignore b/.gitignore
index 17b0fb0a..cbf9ee0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,10 @@
-pretmap.pro.user
+porymap.pro.user
 *.autosave
+*.stash
+*.o
+moc_*
+qrc_*
+porymap.app*
+Makefile
+ui_mainwindow.h
+ui_objectpropertiesframe.h
diff --git a/README.md b/README.md
index 721a7e7a..a1a2bf78 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
-# pretmap
+# porymap
 
-A map editor for [pokeruby][pokeruby] using Qt.
+A map editor for the generation 3 disassembly projects using Qt.
+
+Currently supporting [pokeruby][pokeruby] and [pokeemerald][pokeemerald].
 
 [pokeruby]: https://github.com/pret/pokeruby
+[pokeemerald]: https://github.com/pret/pokeemerald
diff --git a/mainwindow.cpp b/mainwindow.cpp
index b9979dc3..39db11a4 100755
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -23,7 +23,8 @@ MainWindow::MainWindow(QWidget *parent) :
     ui(new Ui::MainWindow)
 {
     QCoreApplication::setOrganizationName("pret");
-    QCoreApplication::setApplicationName("pretmap");
+    QCoreApplication::setApplicationName("porymap");
+    QApplication::setWindowIcon(QIcon(":/icons/porymap-icon-1.ico"));
 
     ui->setupUi(this);
 
@@ -51,6 +52,8 @@ MainWindow::MainWindow(QWidget *parent) :
             openProject(default_dir);
         }
     }
+
+    //ui->setIcon(QIcon(editor->root + "/resources/icons/porymap-icon-1.ico"));
 }
 
 MainWindow::~MainWindow()
@@ -77,12 +80,12 @@ void MainWindow::openProject(QString dir) {
     if (!already_open) {
         editor->project = new Project;
         editor->project->root = dir;
-        setWindowTitle(editor->project->getProjectTitle() + " - pretmap");
+        setWindowTitle(editor->project->getProjectTitle() + " - porymap");
         loadDataStructures();
         populateMapList();
         setMap(getDefaultMap());
     } else {
-        setWindowTitle(editor->project->getProjectTitle() + " - pretmap");
+        setWindowTitle(editor->project->getProjectTitle() + " - porymap");
         loadDataStructures();
         populateMapList();
     }
@@ -154,7 +157,7 @@ void MainWindow::setMap(QString map_name) {
     redrawMapScene();
     displayMapProperties();
 
-    setWindowTitle(map_name + " - " + editor->project->getProjectTitle() + " - pretmap");
+    setWindowTitle(map_name + " - " + editor->project->getProjectTitle() + " - porymap");
 
     connect(editor->map, SIGNAL(mapChanged(Map*)), this, SLOT(onMapChanged(Map *)));
     connect(editor->map, SIGNAL(mapNeedsRedrawing(Map*)), this, SLOT(onMapNeedsRedrawing(Map *)));
diff --git a/mainwindow.ui b/mainwindow.ui
index f3f19222..dccacb4c 100755
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>pretmap</string>
+   <string>porymap</string>
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QGridLayout" name="gridLayout">
diff --git a/pretmap.pro b/porymap.pro
similarity index 85%
rename from pretmap.pro
rename to porymap.pro
index 96014047..7c1e9358 100755
--- a/pretmap.pro
+++ b/porymap.pro
@@ -8,8 +8,10 @@ QT       += core gui
 
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = pretmap
+TARGET = porymap
 TEMPLATE = app
+RC_ICONS = resources/icons/porymap-icon-1.ico
+ICON = resources/icons/porymap-icon-1.ico
 
 
 SOURCES += main.cpp\
diff --git a/resources/icons/porymap-icon-1.ico b/resources/icons/porymap-icon-1.ico
new file mode 100644
index 00000000..9af82ad5
Binary files /dev/null and b/resources/icons/porymap-icon-1.ico differ
diff --git a/resources/images.qrc b/resources/images.qrc
index dfca147d..920c6aad 100755
--- a/resources/images.qrc
+++ b/resources/images.qrc
@@ -16,5 +16,6 @@
         <file>icons/delete.ico</file>
         <file>icons/viewsprites.ico</file>
         <file>images/collisions.png</file>
+        <file>icons/porymap-icon-1.ico</file>
     </qresource>
 </RCC>