diff --git a/AUTHORS b/AUTHORS
index 736f782..fd25692 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -97,6 +97,10 @@ solarized-light.conf
   Joshua Hoff <https://github.com/joshuarh>
  *Matthew Brush <matt(at)geany(dot)org>
 
+steampunk.conf
+--------------------
+ *Baptiste Darthenay <geany(dot)batisteo(at)recursor(dot)net>
+
 tango-dark.conf
 ---------------
   Barry van Oudtshoorn <unknown email address>
diff --git a/colorschemes/steampunk.conf b/colorschemes/steampunk.conf
new file mode 100644
index 0000000..2e9a0a5
--- /dev/null
+++ b/colorschemes/steampunk.conf
@@ -0,0 +1,123 @@
+#
+# Copyright 2013 Baptiste Darthenay <geany(dot)batisteo(at)recursor(dot)net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+#
+# Best folding style with this theme, in filedefs/filetypes.common:
+# folding_style=2,2
+#
+
+[theme_info]
+name=Steampunk
+description=A dark brown and shiny brass theme for the 19th century developer.
+version=2
+author=Baptiste Darthenay
+url=https://github.com/batisteo/geany-themes/blob/master/steampunk.conf
+# list of each compatible Geany release version
+compat=1.22;1.23;1.23.1;1.24
+
+[named_styles]
+
+default=#fea;#252016;false;false
+error=#faecbd;#a22
+
+# Editor styles
+#-------------------------------------------------------------------------------
+
+selection=#000;#605339;false;true
+current_line=#000;#342d1f;true
+brace_good=#8ab634;#514630;true
+brace_bad=#ce5c00;#484333;true
+margin_line_number=#caa223
+margin_folding=#665511;#362a1d
+fold_symbol_highlight=#b79024;#252016
+indent_guide=#b79024
+caret=#d3d7cf;#000
+marker_line=#c4a000;#edd400
+marker_search=#000;#0000f0
+marker_mark=#8c5200;#cf7900
+call_tips=#ccc;#fff;false
+white_space=#650;;true
+
+# Programming languages
+#-------------------------------------------------------------------------------
+
+comment=#786442
+comment_doc=comment
+comment_line=comment
+comment_line_doc=comment_doc
+comment_doc_keyword=comment_doc,bold
+comment_doc_keyword_error=comment_doc,italic
+
+number=#fce94f
+number_1=number
+number_2=number_1
+
+type=#cf7900;;true
+class=type
+function=#cf7900
+parameter=function
+
+keyword=#cc9d22;;true
+keyword_1=keyword
+keyword_2=#729f9c
+keyword_3=keyword_1
+keyword_4=keyword_1
+
+identifier=default
+identifier_1=identifier
+identifier_2=identifier_1
+identifier_3=identifier_1
+identifier_4=identifier_1
+
+string=#ebc95d
+string_1=string
+string_2=comment,italic
+string_3=default
+string_4=default
+string_eol=string_1,italic
+character=string_1
+backtick=string_2
+here_doc=string_2
+verbatim=string
+
+scalar=string_2
+label=default,bold
+preprocessor=#729f9c
+regex=number_1
+operator=#fa5;;true
+decorator=#997788;;;true
+other=default
+extra=#359
+
+# Markup-type languages
+#-------------------------------------------------------------------------------
+
+tag=#729f9c
+tag_unknown=tag
+tag_end=tag,bold
+attribute=#729f9c
+attribute_unknown=attribute
+value=string_1
+entity=default
+
+# Diff
+#-------------------------------------------------------------------------------
+
+line_added=#595
+line_removed=#a66
+line_changed=preprocessor
diff --git a/screenshots/steampunk.png b/screenshots/steampunk.png
new file mode 100644
index 0000000..66ded4e
Binary files /dev/null and b/screenshots/steampunk.png differ