diff --git a/.cproject b/.cproject
index 60fd883..01f6e6f 100644
--- a/.cproject
+++ b/.cproject
@@ -13,7 +13,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="de.innot.avreclipse.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=de.innot.avreclipse.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" id="de.innot.avreclipse.configuration.app.debug.1674332705" name="Debug" parent="de.innot.avreclipse.configuration.app.debug">
+				<configuration artifactName="${ProjName}" buildArtefactType="de.innot.avreclipse.buildArtefactType.app" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=de.innot.avreclipse.buildArtefactType.app,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" description="" id="de.innot.avreclipse.configuration.app.debug.1674332705" name="Debug" optionalBuildProperties="" parent="de.innot.avreclipse.configuration.app.debug">
 					<folderInfo id="de.innot.avreclipse.configuration.app.debug.1674332705." name="/" resourcePath="">
 						<toolChain id="de.innot.avreclipse.toolchain.winavr.app.debug.1454585760" name="AVR-GCC Toolchain" superClass="de.innot.avreclipse.toolchain.winavr.app.debug">
 							<option id="de.innot.avreclipse.toolchain.options.toolchain.objcopy.flash.app.debug.511484921" name="Generate HEX file for Flash memory" superClass="de.innot.avreclipse.toolchain.options.toolchain.objcopy.flash.app.debug"/>
@@ -35,7 +35,7 @@
 									<listOptionValue builtIn="false" value="USE_LUFA_CONFIG_HEADER"/>
 								</option>
 								<option id="de.innot.avreclipse.compiler.option.otherflags.1513967861" name="Other flags" superClass="de.innot.avreclipse.compiler.option.otherflags" value="-ffunction-sections -fdata-sections" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="de.innot.avreclipse.compiler.option.incpath.173462079" superClass="de.innot.avreclipse.compiler.option.incpath" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="de.innot.avreclipse.compiler.option.incpath.173462079" name="Include Paths (-I)" superClass="de.innot.avreclipse.compiler.option.incpath" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/SIMMProgrammer/hal/at90usb646}&quot;"/>
 								</option>
 								<inputType id="de.innot.avreclipse.compiler.winavr.input.1367172122" name="C Source Files" superClass="de.innot.avreclipse.compiler.winavr.input"/>
@@ -60,9 +60,29 @@
 							<tool id="de.innot.avreclipse.tool.avrdude.app.debug.403293383" name="AVRDude" superClass="de.innot.avreclipse.tool.avrdude.app.debug"/>
 						</toolChain>
 					</folderInfo>
+					<folderInfo id="de.innot.avreclipse.configuration.app.debug.1674332705.1156861983" name="/" resourcePath="hal/m258ke">
+						<toolChain id="de.innot.avreclipse.toolchain.winavr.app.debug.1121931489" name="AVR-GCC Toolchain" superClass="de.innot.avreclipse.toolchain.winavr.app.debug" unusedChildren="">
+							<option id="de.innot.avreclipse.toolchain.options.toolchain.objcopy.flash.app.debug.511484921.1081100272" name="Generate HEX file for Flash memory" superClass="de.innot.avreclipse.toolchain.options.toolchain.objcopy.flash.app.debug.511484921"/>
+							<option id="de.innot.avreclipse.toolchain.options.toolchain.objcopy.eeprom.app.debug.102499711.1750673643" name="Generate HEX file for EEPROM" superClass="de.innot.avreclipse.toolchain.options.toolchain.objcopy.eeprom.app.debug.102499711"/>
+							<option id="de.innot.avreclipse.toolchain.options.toolchain.objdump.app.debug.1447923913.2030782937" name="Generate Extended Listing (Source + generated Assembler)" superClass="de.innot.avreclipse.toolchain.options.toolchain.objdump.app.debug.1447923913"/>
+							<option id="de.innot.avreclipse.toolchain.options.toolchain.size.app.debug.839780790.1223122061" name="Print Size" superClass="de.innot.avreclipse.toolchain.options.toolchain.size.app.debug.839780790"/>
+							<option id="de.innot.avreclipse.toolchain.options.toolchain.avrdude.app.debug.1298864252.700671531" name="AVRDude" superClass="de.innot.avreclipse.toolchain.options.toolchain.avrdude.app.debug.1298864252"/>
+							<tool id="de.innot.avreclipse.tool.assembler.winavr.app.debug.1182760221" name="AVR Assembler" superClass="de.innot.avreclipse.tool.assembler.winavr.app.debug.1341917862"/>
+							<tool id="de.innot.avreclipse.tool.compiler.winavr.app.debug.1955722307" name="AVR Compiler" superClass="de.innot.avreclipse.tool.compiler.winavr.app.debug.1123922496"/>
+							<tool id="de.innot.avreclipse.tool.cppcompiler.app.debug.1324575955" name="AVR C++ Compiler" superClass="de.innot.avreclipse.tool.cppcompiler.app.debug.24092953"/>
+							<tool id="de.innot.avreclipse.tool.linker.winavr.app.debug.1850327980" name="AVR C Linker" superClass="de.innot.avreclipse.tool.linker.winavr.app.debug.806884166"/>
+							<tool id="de.innot.avreclipse.tool.cpplinker.app.debug.575860580" name="AVR C++ Linker" superClass="de.innot.avreclipse.tool.cpplinker.app.debug.198227335"/>
+							<tool id="de.innot.avreclipse.tool.archiver.winavr.base.880080809" name="AVR Archiver" superClass="de.innot.avreclipse.tool.archiver.winavr.base.1956389786"/>
+							<tool id="de.innot.avreclipse.tool.objdump.winavr.app.debug.1747827762" name="AVR Create Extended Listing" superClass="de.innot.avreclipse.tool.objdump.winavr.app.debug.1166552106"/>
+							<tool id="de.innot.avreclipse.tool.objcopy.flash.winavr.app.debug.12146022" name="AVR Create Flash image" superClass="de.innot.avreclipse.tool.objcopy.flash.winavr.app.debug.1427404113"/>
+							<tool id="de.innot.avreclipse.tool.objcopy.eeprom.winavr.app.debug.1807335718" name="AVR Create EEPROM image" superClass="de.innot.avreclipse.tool.objcopy.eeprom.winavr.app.debug.2030541034"/>
+							<tool id="de.innot.avreclipse.tool.size.winavr.app.debug.805654159" name="Print Size" superClass="de.innot.avreclipse.tool.size.winavr.app.debug.335508392"/>
+							<tool id="de.innot.avreclipse.tool.avrdude.app.debug.220339009" name="AVRDude" superClass="de.innot.avreclipse.tool.avrdude.app.debug.403293383"/>
+						</toolChain>
+					</folderInfo>
 					<sourceEntries>
+						<entry excluding="hal/m258ke|tests" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="tests"/>
-						<entry excluding="tests" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -104,7 +124,7 @@
 									<listOptionValue builtIn="false" value="USE_LUFA_CONFIG_HEADER"/>
 								</option>
 								<option id="de.innot.avreclipse.compiler.option.otherflags.1566165436" name="Other flags" superClass="de.innot.avreclipse.compiler.option.otherflags" value="-ffunction-sections -fdata-sections" valueType="string"/>
-								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="de.innot.avreclipse.compiler.option.incpath.2119807530" superClass="de.innot.avreclipse.compiler.option.incpath" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="de.innot.avreclipse.compiler.option.incpath.2119807530" name="Include Paths (-I)" superClass="de.innot.avreclipse.compiler.option.incpath" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/SIMMProgrammer/hal/at90usb646}&quot;"/>
 								</option>
 								<inputType id="de.innot.avreclipse.compiler.winavr.input.2084198580" name="C Source Files" superClass="de.innot.avreclipse.compiler.winavr.input"/>
@@ -129,9 +149,29 @@
 							<tool id="de.innot.avreclipse.tool.avrdude.app.release.1179659974" name="AVRDude" superClass="de.innot.avreclipse.tool.avrdude.app.release"/>
 						</toolChain>
 					</folderInfo>
+					<folderInfo id="de.innot.avreclipse.configuration.app.release.1163010375.1768967941" name="/" resourcePath="hal/m258ke">
+						<toolChain id="de.innot.avreclipse.toolchain.winavr.app.release.637923190" name="AVR-GCC Toolchain" superClass="de.innot.avreclipse.toolchain.winavr.app.release" unusedChildren="">
+							<option id="de.innot.avreclipse.toolchain.options.toolchain.objcopy.flash.app.release.1550189649.1760992087" name="Generate HEX file for Flash memory" superClass="de.innot.avreclipse.toolchain.options.toolchain.objcopy.flash.app.release.1550189649"/>
+							<option id="de.innot.avreclipse.toolchain.options.toolchain.objcopy.eeprom.app.release.804255150.1237218347" name="Generate HEX file for EEPROM" superClass="de.innot.avreclipse.toolchain.options.toolchain.objcopy.eeprom.app.release.804255150"/>
+							<option id="de.innot.avreclipse.toolchain.options.toolchain.objdump.app.release.498398371.1030616078" name="Generate Extended Listing (Source + generated Assembler)" superClass="de.innot.avreclipse.toolchain.options.toolchain.objdump.app.release.498398371"/>
+							<option id="de.innot.avreclipse.toolchain.options.toolchain.size.app.release.544896205.72930579" name="Print Size" superClass="de.innot.avreclipse.toolchain.options.toolchain.size.app.release.544896205"/>
+							<option id="de.innot.avreclipse.toolchain.options.toolchain.avrdude.app.release.1698397894.1466640013" name="AVRDude" superClass="de.innot.avreclipse.toolchain.options.toolchain.avrdude.app.release.1698397894"/>
+							<tool id="de.innot.avreclipse.tool.assembler.winavr.app.release.1845098382" name="AVR Assembler" superClass="de.innot.avreclipse.tool.assembler.winavr.app.release.1168333362"/>
+							<tool id="de.innot.avreclipse.tool.compiler.winavr.app.release.211599198" name="AVR Compiler" superClass="de.innot.avreclipse.tool.compiler.winavr.app.release.883804772"/>
+							<tool id="de.innot.avreclipse.tool.cppcompiler.app.release.1341464787" name="AVR C++ Compiler" superClass="de.innot.avreclipse.tool.cppcompiler.app.release.912002244"/>
+							<tool id="de.innot.avreclipse.tool.linker.winavr.app.release.899751834" name="AVR C Linker" superClass="de.innot.avreclipse.tool.linker.winavr.app.release.381852607"/>
+							<tool id="de.innot.avreclipse.tool.cpplinker.app.release.776550318" name="AVR C++ Linker" superClass="de.innot.avreclipse.tool.cpplinker.app.release.929102657"/>
+							<tool id="de.innot.avreclipse.tool.archiver.winavr.base.1378114625" name="AVR Archiver" superClass="de.innot.avreclipse.tool.archiver.winavr.base.534869254"/>
+							<tool id="de.innot.avreclipse.tool.objdump.winavr.app.release.744454197" name="AVR Create Extended Listing" superClass="de.innot.avreclipse.tool.objdump.winavr.app.release.1162163813"/>
+							<tool id="de.innot.avreclipse.tool.objcopy.flash.winavr.app.release.770873154" name="AVR Create Flash image" superClass="de.innot.avreclipse.tool.objcopy.flash.winavr.app.release.1254097849"/>
+							<tool id="de.innot.avreclipse.tool.objcopy.eeprom.winavr.app.release.1006892833" name="AVR Create EEPROM image" superClass="de.innot.avreclipse.tool.objcopy.eeprom.winavr.app.release.1435818473"/>
+							<tool id="de.innot.avreclipse.tool.size.winavr.app.release.1301170685" name="Print Size" superClass="de.innot.avreclipse.tool.size.winavr.app.release.1166766118"/>
+							<tool id="de.innot.avreclipse.tool.avrdude.app.release.12593576" name="AVRDude" superClass="de.innot.avreclipse.tool.avrdude.app.release.1179659974"/>
+						</toolChain>
+					</folderInfo>
 					<sourceEntries>
+						<entry excluding="hal/m258ke|tests" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="tests"/>
-						<entry excluding="tests" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -143,7 +183,14 @@
 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
 		<project id="SIMMProgrammer.de.innot.avreclipse.project.winavr.elf_2.1.0.1374953899" name="AVR Cross Target Application" projectType="de.innot.avreclipse.project.winavr.elf_2.1.0"/>
 	</storageModule>
-	<storageModule moduleId="refreshScope"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Debug">
+			<resource resourceType="PROJECT" workspacePath="/SIMMProgrammer"/>
+		</configuration>
+		<configuration configurationName="Release">
+			<resource resourceType="PROJECT" workspacePath="/SIMMProgrammer"/>
+		</configuration>
+	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
 	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 	<storageModule moduleId="scannerConfiguration">
@@ -276,4 +323,4 @@
 		</scannerConfigBuildInfo>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-</cproject>
+</cproject>
\ No newline at end of file