Index: action.py
==================================================================
--- action.py
+++ action.py
@@ -39,11 +39,11 @@
 class action:
 
         # streamlink formats
         lt = {"asx":"video/x-ms-asf", "pls":"audio/x-scpls", "m3u":"audio/x-mpegurl", "xspf":"application/xspf+xml", "href":"url/http", "ram":"audio/x-pn-realaudio", "smil":"application/smil"}
         # media formats
-        mf = {"mp3":"audio/mp3", "ogg":"audio/ogg", "aac":"audio/aac"}
+        mf = {"mp3":"audio/mpeg", "ogg":"audio/ogg", "aac":"audio/aac"}
         
         
         # web
         @staticmethod
         def browser(url):
@@ -61,16 +61,16 @@
                 return "%r" % str(s)
 
 
         # calls player for stream url and format
         @staticmethod
-        def play(url, audioformat="audio/mp3", listformat="text/x-href"):
+        def play(url, audioformat="audio/mpeg", listformat="text/x-href"):
             if (url):
                 url = action.url(url, listformat)
             if (audioformat):
-                if audioformat == "audio/mpeg":
-                    audioformat = "audio/mp3"  # internally we use the more user-friendly moniker
+                if audioformat == "audio/mp3":
+                    audioformat = "audio/mpeg"
                 cmd = conf.play.get(audioformat, conf.play.get("*/*", "vlc %u"))
                 __print__( dbg.PROC,"play", url, cmd )
             try:
                 action.run( action.interpol(cmd, url) )
             except:
@@ -86,11 +86,11 @@
                 os.system(cmd + " &")
 
 
         # streamripper
         @staticmethod
-        def record(url, audioformat="audio/mp3", listformat="text/x-href", append="", row={}):
+        def record(url, audioformat="audio/mpeg", listformat="text/x-href", append="", row={}):
             __print__( dbg.PROC, "record", url )
             cmd = conf.record.get(audioformat, conf.record.get("*/*", None))
             try: action.run( action.interpol(cmd, url, row) + append )
             except: pass
 
@@ -209,11 +209,11 @@
                 return action.pls(pls)
             elif (re.search("\.asx", pls)):	#video/x-ms-asf
                 return re.findall("<Ref\s+href=\"(http://.+?)\"", http.get(pls))
             elif (re.search("\.m3u|\.ram|\.smil", pls)):	#audio/x-mpegurl
                 return re.findall("(http://[^\s]+)", http.get(pls), re.I)
-            else:  # just assume it was a direct mp3/ogg streamserver link
+            else:  # just assume it was a direct mpeg/ogg streamserver link
                 return [ (pls if pls.startswith("/") else http.fix_url(pls)) ]
             pass
 
 
         # generate filename for temporary .m3u, if possible with unique id

Index: channels/_generic.py
==================================================================
--- channels/_generic.py
+++ channels/_generic.py
@@ -50,11 +50,11 @@
         module = "generic"
         title = "GenericChannel"
         homepage = "http://milki.inlcude-once.org/streamtuner2/"
         base_url = ""
         listformat = "audio/x-scpls"
-        audioformat = "audio/mp3" # fallback value
+        audioformat = "audio/mpeg" # fallback value
         config = []
         has_search = False
 
         # categories
         categories = ["empty", ]
@@ -429,13 +429,13 @@
         def mime_fmt(self, s):
             # clean string
             s = s.lower().strip()
             # rename
             map = {
-                "audio/mpeg":"audio/mp3",  # Note the real mime type is /mpeg, but /mp3 is more understandable in the GUI
+                "audio/mp3":"audio/mpeg",  # Note the real mime type is /mpeg, but /mp3 is more understandable in the GUI
                 "ogg":"ogg", "ogm":"ogg", "xiph":"ogg", "vorbis":"ogg", "vnd.xiph.vorbis":"ogg",
-                "mpeg":"mp3", "mp":"mp3", "mp2":"mp3", "mpc":"mp3", "mps":"mp3",
+                "mp3":"mpeg", "mp":"mpeg", "mp2":"mpeg", "mpc":"mpeg", "mps":"mpeg",
                 "aac+":"aac", "aacp":"aac",
                 "realaudio":"x-pn-realaudio", "real":"x-pn-realaudio", "ra":"x-pn-realaudio", "ram":"x-pn-realaudio", "rm":"x-pn-realaudio",
                 # yes, we do video
                 "flv":"video/flv", "mp4":"video/mp4",
             }

Index: channels/internet_radio_org_uk.py
==================================================================
--- channels/internet_radio_org_uk.py
+++ channels/internet_radio_org_uk.py
@@ -110,11 +110,11 @@
                         "homepage": http.fix_url(homepage),
                         "title": title,
                         "playing": playing,
                         "bitrate": int(bitrate),
                         "listeners": int(listeners if listeners else 0),
-                        "format": "audio/mp3", # there is no stream info on that, but internet-radio.org.uk doesn't seem very ogg-friendly anyway, so we assume the default here
+                        "format": "audio/mpeg", # there is no stream info on that, but internet-radio.org.uk doesn't seem very ogg-friendly anyway, so we assume the default here
                     })
 
             # DOM parsing
             else:
                 # the streams are arranged in table rows
@@ -129,11 +129,11 @@
                         "homepage": http.fix_url(dir.find("a.url").attr("href")),
                         "url": dir.find("a").eq(2).attr("href"),
                         "genre": dir.find("td").eq(0).text(),
                         "bitrate": int(bl[0]),
                         "listeners": int(bl[1]),
-                        "format": "audio/mp3",
+                        "format": "audio/mpeg",
                         "playing": dir.find("td").eq(1).children().remove().end().text()[13:].strip(),
                     })
             
             # next page?
             if str(page+1) not in rx_pages.findall(html):

Index: channels/punkcast.py
==================================================================
--- channels/punkcast.py
+++ channels/punkcast.py
@@ -72,11 +72,11 @@
             (homepage, id, title) = uu
             entries.append({
                     "genre": "?",
                     "title": title,
                     "playing": "PUNKCAST #"+id,
-                    "format": "audio/mp3",
+                    "format": "audio/mpeg",
                     "homepage": homepage,
             })
 
         # done    
         return entries

Index: channels/timer.py
==================================================================
--- channels/timer.py
+++ channels/timer.py
@@ -164,11 +164,11 @@
         
     # action wrapper
     def play(self, row, *args, **kwargs):
         action.play(
             url = row["url"],
-            audioformat = row.get("format","audio/mp3"), 
+            audioformat = row.get("format","audio/mpeg"), 
             listformat = row.get("listformat","url/direct"),
         )
 
     # action wrapper
     def record(self, row, *args, **kwargs):
@@ -182,14 +182,14 @@
             append = ""
 
         # start recording
         action.record(
             url = row["url"],
-            audioformat = row.get("format","audio/mp3"), 
+            audioformat = row.get("format","audio/mpeg"), 
             listformat = row.get("listformat","url/direct"),
             append = append,
         )
     
     def test(self, row, *args, **kwargs):
         print("TEST KRONOS", row)
 
 

Index: cli.py
==================================================================
--- cli.py
+++ cli.py
@@ -107,11 +107,11 @@
             
     # run player
     def play(self, *args):
         row = self.stream(*args)
         if row.get("url"):
-            #action.action.play(row["url"], audioformat=row.get("format","audio/mp3"))
+            #action.action.play(row["url"], audioformat=row.get("format","audio/mpeg"))
             self.plugins[self.current_channel].play(row)
             
     # return cache data 1:1
     def dump(self, channel):
         c = self.channel(channel)

Index: config.py
==================================================================
--- config.py
+++ config.py
@@ -48,10 +48,11 @@
             
             # settings from last session
             last = self.load("settings")
             if (last):
                 self.update(last)
+                self.migrate()
             # store defaults in file
             else:
                 self.save("settings")
                 self.firstrun = 1
 
@@ -58,11 +59,11 @@
 
         # some defaults
         def defaults(self):
             self.browser = "sensible-browser"
             self.play = {
-               "audio/mp3": "audacious ",	# %u for url to .pls, %g for downloaded .m3u
+               "audio/mpeg": "audacious ",	# %u for url to .pls, %g for downloaded .m3u
                "audio/ogg": "audacious ",
                "audio/aac": "amarok -l ",
                "audio/x-pn-realaudio": "vlc --one-instance",
                "audio/*": "totem ",
                "*/*": "vlc --one-instance %srv",
@@ -178,10 +179,17 @@
                     self[key].update(value)
                 else:
                     self[key] = value
             # descends into sub-dicts instead of wiping them with subkeys
 
+        # update old setting names
+        def migrate(self):
+            # 2.1.1
+            if "audio/mp3" in self.play:
+                self.play["audio/mpeg"] = self.play["audio/mp3"]
+                del self.play["audio/mp3"]
+
              
         # check for existing filename in directory list
         def find_in_dirs(self, dirs, file):
             for d in dirs:
                 if os.path.exists(d+"/"+file):

Index: gtk2.xml
==================================================================
--- gtk2.xml
+++ gtk2.xml
@@ -1216,11 +1216,11 @@
                                 <property name="top_attach">12</property>
                                 <property name="bottom_attach">13</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkEntry" id="config_play_audio_mp3">
+                              <object class="GtkEntry" id="config_play_audio_mpeg">
                                 <property name="width_request">200</property>
                                 <property name="height_request">20</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">●</property>
@@ -1239,11 +1239,12 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="label7">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">audio/mp3</property>
+                                <property name="label"
+                                translatable="yes">audio/mpeg</property>
                               </object>
                               <packing>
                                 <property name="top_attach">1</property>
                                 <property name="bottom_attach">2</property>
                               </packing>

Index: st2.py
==================================================================
--- st2.py
+++ st2.py
@@ -312,11 +312,11 @@
 
 
         # streamripper
         def on_record_clicked(self, widget):
             row = self.row()
-            action.record(row.get("url"), "audio/mp3", "url/direct", row=row)
+            action.record(row.get("url"), "audio/mpeg", "url/direct", row=row)
 
 
         # browse stream
         def on_homepage_stream_clicked(self, widget):
             url = self.selected("homepage")             
@@ -723,11 +723,11 @@
 
             
         # add a new list entry, update window
         def new(self, w):
             s = main.channel().stations()
-            s.append({"title":"new", "url":"", "format":"audio/mp3", "genre":"", "listeners":1});
+            s.append({"title":"new", "url":"", "format":"audio/mpeg", "genre":"", "listeners":1});
             main.channel().switch() # update display
             main.channel().gtk_list.get_selection().select_path(str(len(s)-1)); # set cursor to last row
             self.open(w)
 
 
@@ -768,11 +768,11 @@
             for key,val in config.items():
                 # map non-alphanumeric chars from config{} to underscores in according gtk widget names
                 id = re.sub("[^\w]", "_", key)
                 w = main.get_widget(prefix + id)
                 __print__(dbg.CONF, "config", ("save" if save else "load"), prefix+id, w, val)
-                # recurse into dictionaries, transform: conf.play.audio/mp3 => conf.play_audio_mp3
+                # recurse into dictionaries, transform: conf.play.audio/mpeg => conf.play_audio_mpeg
                 if (type(val) == dict):
                     self.apply(val, prefix + id + "_", save)
                 # load or set gtk.Entry text field
                 elif (w and save and type(w)==gtk.Entry):
                     config[key] = w.get_text()