diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 39156fc..9b40e1e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,6 @@
+By lolandese:
+  Converted into and added a D6 branch.
+
 #1676038#comment-6474406 by klausi:
   Added a section "Related projects" to the project page, linking to the Float
   filter module.
diff --git a/README.txt b/README.txt
index 63350ee..3650fc8 100644
--- a/README.txt
+++ b/README.txt
@@ -1,6 +1,6 @@
 Name: AutoFloat (autofloat)
 Author: Martin Postma ('lolandese', http://drupal.org/user/210402)
-Drupal: 7.x
+Drupal: 6.x
 
 
 -- SUMMARY --
@@ -43,10 +43,10 @@ Extract the package in your modules directory, e.g. '/sites/all/modules'.
 Enable the module under '/admin/modules'.
 
 Add the autofloat filter to one of your text formats under 
-'/admin/config/content/formats'. Put it below other image related filters in
-the 'filter processing order'.
+'/admin/settings/filters'. Put it below other image related filters in
+the 'Arrange' tab.
 
-Configure under '/admin/config/content/autofloat'.
+Configure under '/admin/settings/autofloat'.
 
 Re-save existing nodes you want to apply AutoFloat to. If you still can't see
 any changes, try clearing both your site and browser cache as well.
@@ -83,4 +83,4 @@ to target the node body. Adjust the id or class used in the modules' css files
 accordingly.
 
 You can exclude the module's CSS on the configuration page to use your
-customized theme's style.css.
+customized theme's style.css.
\ No newline at end of file
diff --git a/autofloat-rtl.css b/autofloat-rtl.css
index 23c7dee..24df666 100644
--- a/autofloat-rtl.css
+++ b/autofloat-rtl.css
@@ -6,7 +6,7 @@
 .content span.autofloat-odd,
 #content span.autofloat-odd {
   float: left;
-  margin: 5px 5px 0 0;
+  margin: 5px 10px 0 0;
 }
 
 .content span.autofloat-even,
diff --git a/autofloat.admin.inc b/autofloat.admin.inc
index fd1201d..85f4e7c 100644
--- a/autofloat.admin.inc
+++ b/autofloat.admin.inc
@@ -16,7 +16,7 @@ function autofloat_admin_settings() {
       1 => t('left (swaps "odd" and "even" classes)'),
     ),
     '#default_value' => variable_get('autofloat_start', 0),
-    '#description' => t('Re-save existing content to apply changes.'),
+    '#description' => t('Re-save existing content to apply changes. Clear site and browser cache if necessary.'),
   );
   $form['autofloat_css'] = array(
     '#type' => 'checkbox',
@@ -43,4 +43,4 @@ function autofloat_admin_settings() {
   );
 
   return system_settings_form($form);
-}
+}
\ No newline at end of file
diff --git a/autofloat.css b/autofloat.css
index 7f9269f..e30dfc7 100644
--- a/autofloat.css
+++ b/autofloat.css
@@ -12,5 +12,5 @@
 .content span.autofloat-even,
 #content span.autofloat-even {
   float: left; /* LTR */
-  margin: 5px 5px 0 0; /* LTR */
+  margin: 5px 10px 0 0; /* LTR */
 }
diff --git a/autofloat.info b/autofloat.info
index 7dd9e0f..dd3c812 100644
--- a/autofloat.info
+++ b/autofloat.info
@@ -1,4 +1,3 @@
 name = AutoFloat
-description = A text format filter that wraps images in a span with odd/even classes to make them float alternately left and right.
-core = 7.x
-configure = admin/config/content/autofloat
+description = An input format filter that wraps images in a span with odd/even classes to make them float alternately left and right.
+core = 6.x
diff --git a/autofloat.install b/autofloat.install
index e326f62..38fcf92 100644
--- a/autofloat.install
+++ b/autofloat.install
@@ -10,8 +10,8 @@
 function autofloat_install() {
   $t = get_t();
   $text = $t('Add the AutoFloat filter to a text format under !formats_link. Move it below other image related filters in the filter processing order. AutoFloat settings are available under !config_link.', array(
-    '!formats_link' => l($t('Configuration > Content authoring > Text formats'), 'admin/config/content/formats'),
-    '!config_link' => l($t('Configuration > Content authoring > AutoFloat'), 'admin/config/content/autofloat'),
+    '!formats_link' => l($t('Site configuration > Input formats'), 'admin/settings/filters'),
+    '!config_link' => l($t('Site configuration >  AutoFloat'), 'admin/settings/autofloat'),
     )
   );
   drupal_set_message($text);
@@ -22,8 +22,6 @@ function autofloat_install() {
  */
 function autofloat_uninstall() {
   // Delete all variables set in variable table.
-  db_delete('variable')
-  ->condition('name', 'autofloat_%', 'LIKE')
-  ->execute();
+  db_query("DELETE FROM {variable} WHERE name LIKE 'autofloat_%%'");
   cache_clear_all('variables', 'cache_bootstrap');
-}
+}
\ No newline at end of file
diff --git a/autofloat.module b/autofloat.module
index eb622b8..afa0b33 100644
--- a/autofloat.module
+++ b/autofloat.module
@@ -21,7 +21,7 @@ function autofloat_help($path, $arg) {
 function autofloat_init() {
   // Determine the setting to use autofloat.css or not.
   if (variable_get('autofloat_css', 1)) {
-    drupal_add_css(drupal_get_path('module', 'autofloat') . '/autofloat.css', array('group' => CSS_DEFAULT, 'every_page' => TRUE));
+    drupal_add_css(drupal_get_path('module', 'autofloat') . '/autofloat.css', $type = 'module', $media = 'all',  $preprocess = TRUE);
   }
 }
 
@@ -29,7 +29,7 @@ function autofloat_init() {
  * Implements hook_menu().
  */
 function autofloat_menu() {
-  $items['admin/config/content/autofloat'] = array(
+  $items['admin/settings/autofloat'] = array(
     'title' => 'AutoFloat',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('autofloat_admin_settings'),
@@ -43,44 +43,46 @@ function autofloat_menu() {
 /**
  * Implements hook_filter_info().
  */
-function autofloat_filter_info() {
-  $filters['filter_autofloat'] = array(
-    'title' => t('Auto Float'),
-    'description' => t('Images will float left and right unless escaped with a class "nofloat".'),
-    'process callback' => '_autofloat_filter',
-    'settings callback' => '_autofloat_filter_settings',
-    'tips callback' => '_autofloat_filter_tips',
-  );
-  return $filters;
+function autofloat_filter($op, $delta = 0, $format = -1, $text = '') {
+  if ($op == 'list') {
+    return array(0 => t('AutoFloat'));
+  }
+  switch ($delta) {
+  case 0:
+
+    switch ($op) {
+    case 'description':
+      return t('Images will float left and right unless escaped with a class "nofloat".');
+
+    case 'prepare':
+      return $text;
+
+    case 'process':
+      return _autofloat($text, $format);
+
+    case 'settings':
+      $form['autofloat']['notice'] = array(
+      '#value' => t('<p>These settings are shared by all the input formats where <em>Autofloat</em> is enabled:</p>'),
+      );
+      return $form;
+
+    }
+    break;
+  }
 }
 
 /**
  * Returns the filter information for the filter help page.
  */
-function _autofloat_filter_tips($filter, $format, $long = TRUE) {
-  $output = t('Images will float left and right unless escaped with a class "nofloat".');
+function autofloat_filter_tips($delta, $format, $long = FALSE) {
+  $output = t('Images will float left and right unless escaped with <em>class="nofloat"</em>');
   return $output;
 }
 
 /**
- * Notice in the AutoFloat settings on the text format configuration page.
- */
-function _autofloat_filter_settings($form, &$form_state, $filter, $format, $defaults, $filters) {
-  $elements['notice'] = array(
-    '#markup' => t('!config_link are shared by all the text formats where it is enabled.', array(
-      '!config_link' => l(t('AutoFloat Filter settings'), 'admin/config/content/autofloat', array(
-        'attributes' => array('title' => 'Unified settings page'),
-        )
-      ),
-    )),
-  );
-  return $elements;
-}
-
-/**
  * Find a rejected 'div', a selected 'span', a link with image or an image.
  */
-function _autofloat_filter($text, $filter) {
+function _autofloat($text, $format) {
   $selector = variable_get('autofloat_span', 'caption');
   // Divide the variable into two selectors if a comma is found.
   $selector = explode(',', $selector);
@@ -136,4 +138,4 @@ function autofloat_filter_callback($matches) {
   else {
     return $matches[0];
   }
-}
+}
\ No newline at end of file