Index: arduino-1.6.5/app/src/cc/arduino/packages/formatter/AStyle.java
===================================================================
--- arduino-1.6.5/app/src/cc/arduino/packages/formatter/AStyle.java
+++ arduino-1.6.5/app/src/cc/arduino/packages/formatter/AStyle.java	2015-09-05 22:46:41.340059281 +0200
@@ -29,7 +29,7 @@
  * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
  */
 
-package cc.arduino.packages.formatter;
+//package cc.arduino.packages.formatter;
 
 import processing.app.Base;
 import processing.app.BaseNoGui;
Index: arduino-1.6.5/app/src/cc/arduino/packages/formatter/AStyleInterface.java
===================================================================
--- arduino-1.6.5/app/src/cc/arduino/packages/formatter/AStyleInterface.java
+++ arduino-1.6.5/app/src/cc/arduino/packages/formatter/AStyleInterface.java	2015-09-05 22:46:41.342059292 +0200
@@ -27,7 +27,7 @@
  * Copyright 2015 Arduino LLC (http://www.arduino.cc/)
  */
 
-package cc.arduino.packages.formatter;
+//package cc.arduino.packages.formatter;
 
 import processing.app.Base;
 
@@ -36,10 +36,12 @@
 public class AStyleInterface {
 
   static {
-    File astyleLib = new File(Base.getContentFile("lib"), System.mapLibraryName("astylej"));
-    String astylePath = astyleLib.getAbsolutePath();
+    //File astyleLib = new File(Base.getContentFile("lib"), System.mapLibraryName("astylej"));
+    //String astylePath = astyleLib.getAbsolutePath();
+    String astylePath = "astylej";
     try {
-      System.load(astylePath);
+      //System.load(astylePath);
+      System.loadLibrary(astylePath);
     } catch (UnsatisfiedLinkError e) {
       e.printStackTrace();
       System.out.println(e.getMessage());
Index: arduino-1.6.5/app/src/processing/app/Editor.java
===================================================================
--- arduino-1.6.5/app/src/processing/app/Editor.java
+++ arduino-1.6.5/app/src/processing/app/Editor.java	2015-09-05 22:46:41.344059303 +0200
@@ -1058,7 +1058,8 @@
   private void addInternalTools(JMenu menu) {
     JMenuItem item;
 
-    item = createToolMenuItem("cc.arduino.packages.formatter.AStyle");
+    //item = createToolMenuItem("cc.arduino.packages.formatter.AStyle");
+    item = createToolMenuItem("AStyle");
     if (item == null) {
       throw new NullPointerException("Tool cc.arduino.packages.formatter.AStyle unavailable");
     }
@@ -2748,7 +2749,8 @@
 
     menu.addSeparator();
 
-    JMenuItem item = createToolMenuItem("cc.arduino.packages.formatter.AStyle");
+    //JMenuItem item = createToolMenuItem("cc.arduino.packages.formatter.AStyle");
+    JMenuItem item = createToolMenuItem("AStyle");
     if (item == null) {
       throw new NullPointerException("Tool cc.arduino.packages.formatter.AStyle unavailable");
     }