diff --git a/.editorconfig b/.editorconfig
index 8e77927..dd1bf85 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,19 +1,27 @@
 # Editor config file, see http://editorconfig.org/
 root = true
 
-#are there any other file formats that requrie tabs?
 [*]
 charset = utf-8
 indent_style = space
-end_of_line = lf #verified v/sv
+end_of_line = lf
 insert_final_newline = true
-trim_trailing_whitespace = true #validated c
+trim_trailing_whitespace = true
 
-[*.{h,cpp,tcl,v,sv,html}]
-indent_size = 2 #validated
+[{*.{h,cpp,cc,tcl,v,sv,html,sh,cmake},CMakeLists.txt}]
+indent_size = 2
 
 [*.py]
 indent_size = 4
 
 [Makefile]
 indent_style = tab
+
+# Ignore third_party directory
+[/third_party/**]
+charset = unset
+indent_style = unset
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+indent_size = unset
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 5b6e9cb..0000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,37 +0,0 @@
----
-name: Generic Issue Template
-about: A standard issue template to use in all Symbiflow repositories. Adapted from [*Open Source Templates*](https://www.talater.com/open-source-templates/#/) by Tal Ater. 
----
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Expected Behavior
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
-
-## Current Behavior
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
-
-## Possible Solution
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-## Steps to Reproduce (for bugs)
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Context
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Your Environment
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-* Version used:
-* Environment name and version (e.g. Chrome 39, node.js 5.4):
-* Operating System and version (desktop or mobile):
-* Link to your project:
-
diff --git a/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE-BUG.md b/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE-BUG.md
new file mode 100644
index 0000000..d63a7df
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE-BUG.md
@@ -0,0 +1,38 @@
+---
+name: Bug Report
+title: Bug Report
+about: A standard issue template to use in all Symbiflow repositories. Adapted from Open Source Templates by Tal Ater. 
+labels: bug
+---
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Description
+<!--- Provide a more detailed introduction to the issue itself, and why you consider it to be a bug -->
+
+## Expected Behavior
+<!--- Tell us what should happen -->
+
+## Actual Behavior
+<!--- Tell us what happens instead -->
+
+## Possible Fix
+<!--- Not obligatory, but suggest a fix or reason for the bug -->
+
+## Steps to Reproduce
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Context
+<!--- How has this bug affected you? What were you trying to accomplish? -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Version used:
+* Environment name and version (e.g. Chrome 39, node.js 5.4):
+* Operating System and version (desktop or mobile):
+* Link to your project:
+
diff --git a/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE-FEATURE.md b/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE-FEATURE.md
new file mode 100644
index 0000000..fb6e82c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/ISSUE_TEMPLATE-FEATURE.md
@@ -0,0 +1,24 @@
+---
+name: New Feature/Improvement
+about: A standard issue template to use in all Symbiflow repositories. Adapted from Open Source Templates by Tal Ater. 
+labels: enhancement
+---
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Detailed Description
+<!--- Provide a detailed description of the change or addition you are proposing -->
+
+## Context
+<!--- Why is this change important to you? How would you use it? -->
+<!--- How can it benefit other users? -->
+
+## Possible Implementation
+<!--- Not obligatory, but suggest an idea for implementing addition or change -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Version used:
+* Environment name and version (e.g. Chrome 39, node.js 5.4):
+* Operating System and version (desktop or mobile):
+* Link to your project:
+